1 files changed, 23 insertions, 2 deletions
diff --git a/src/layout.cpp b/src/layout.cpp
index 011141b..e108046 100644
--- a/src/layout.cpp
+++ b/src/layout.cpp
@@ -832,6 +832,13 @@ class LayoutParser : public QXmlDefaultHandler
           javaOpt    ? theTranslator->trPackageListDescription() : fortranOpt ? theTranslator->trModulesListDescription(extractAll) : theTranslator->trNamespaceListDescription(extractAll),
           "namespaces"
         },
+        { "namespacelist",
+          LayoutNavEntry::NamespaceList,
+          javaOpt    ? theTranslator->trPackages() : fortranOpt ? theTranslator->trModulesList() : theTranslator->trNamespaceList(),
+          QCString(),
+          javaOpt    ? theTranslator->trPackageListDescription() : fortranOpt ? theTranslator->trModulesListDescription(extractAll) : theTranslator->trNamespaceListDescription(extractAll),
+          "namespaces"
+        },
         { "namespacemembers",
           LayoutNavEntry::NamespaceMembers,
           javaOpt    ? theTranslator->trPackageMembers() : fortranOpt ? theTranslator->trModulesMembers() : theTranslator->trNamespaceMembers(),
@@ -840,19 +847,26 @@ class LayoutParser : public QXmlDefaultHandler
           "namespacemembers"
         },
         { "classindex",
-          LayoutNavEntry::Classes,
+          LayoutNavEntry::ClassIndex,
           fortranOpt ? theTranslator->trDataTypes() : vhdlOpt ? VhdlDocGen::trDesignUnits() : theTranslator->trCompoundIndex(),
           QCString(),
           QCString(),
           "classes"
         },
         { "classes",
-          LayoutNavEntry::ClassAnnotated,
+          LayoutNavEntry::Classes,
           fortranOpt ? theTranslator->trCompoundListFortran() : vhdlOpt ? VhdlDocGen::trDesignUnitList() : theTranslator->trClasses(),
           theTranslator->trCompoundList(),
           fortranOpt ? theTranslator->trCompoundListDescriptionFortran() : vhdlOpt ? VhdlDocGen::trDesignUnitListDescription() : theTranslator->trCompoundListDescription(),
           "annotated"
         },
+        { "classlist",
+          LayoutNavEntry::ClassList,
+          theTranslator->trCompoundList(),
+          QCString(),
+          fortranOpt ? theTranslator->trCompoundListDescriptionFortran() : vhdlOpt ? VhdlDocGen::trDesignUnitListDescription() : theTranslator->trCompoundListDescription(),
+          "annotated"
+        },
         { "hierarchy",
           LayoutNavEntry::ClassHierarchy,
           vhdlOpt    ? VhdlDocGen::trDesignUnitHierarchy() : theTranslator->trClassHierarchy(),
@@ -874,6 +888,13 @@ class LayoutParser : public QXmlDefaultHandler
           theTranslator->trFileListDescription(extractAll),
           "files"
         },
+        { "filelist",
+          LayoutNavEntry::FileList,
+          theTranslator->trFileList(),
+          QCString(),
+          theTranslator->trFileListDescription(extractAll),
+          "files"
+        },
         { "globals",
           LayoutNavEntry::FileGlobals,
           theTranslator->trFileMembers(),