Add missing entries for page outline for group pages

Author: doxygen

src/groupdef.cpp

@@ -916,7 +916,9 @@ void GroupDefImpl::writeFiles(OutputList &ol,const QCString &title)
     {
       if (!fd->hasDocumentation()) continue;
       ol.startMemberDeclaration();
-      ol.startMemberItem(fd->anchor(),OutputGenerator::MemberItemType::Normal);
+      QCString anc = fd->anchor();
+      if (anc.isEmpty()) anc=fd->displayName(); else anc.prepend(fd->displayName()+"_");
+      ol.startMemberItem(anc,OutputGenerator::MemberItemType::Normal);
       ol.docify(theTranslator->trFile(FALSE,TRUE)+" ");
       ol.insertMemberAlign();
       ol.writeObjectLink(fd->getReference(),fd->getOutputFileBase(),QCString(),fd->displayName());
@@ -960,9 +962,9 @@ void GroupDefImpl::writeNestedGroups(OutputList &ol,const QCString &title)
       {
         if (!gd->hasDocumentation()) continue;
         ol.startMemberDeclaration();
-        ol.startMemberItem(gd->anchor(),OutputGenerator::MemberItemType::Normal);
-        //ol.docify(theTranslator->trGroup(FALSE,TRUE));
-        //ol.docify(" ");
+        QCString anc = gd->anchor();
+        if (anc.isEmpty()) anc=gd->name(); else anc.prepend(gd->name()+"_");
+        ol.startMemberItem(anc,OutputGenerator::MemberItemType::Normal);
         ol.insertMemberAlign();
         ol.writeObjectLink(gd->getReference(),gd->getOutputFileBase(),QCString(),gd->groupTitle());
         ol.endMemberItem(OutputGenerator::MemberItemType::Normal);
@@ -993,7 +995,9 @@ void GroupDefImpl::writeDirs(OutputList &ol,const QCString &title)
     {
       if (!dd->hasDocumentation()) continue;
       ol.startMemberDeclaration();
-      ol.startMemberItem(dd->anchor(),OutputGenerator::MemberItemType::Normal);
+      QCString anc = dd->anchor();
+      if (anc.isEmpty()) anc=dd->shortName(); else anc.prepend(dd->shortName()+"_");
+      ol.startMemberItem(anc,OutputGenerator::MemberItemType::Normal);
       ol.parseText(theTranslator->trDir(FALSE,TRUE));
       ol.insertMemberAlign();
       ol.writeObjectLink(dd->getReference(),dd->getOutputFileBase(),QCString(),dd->shortName());

templates/html/navtree.js

@@ -523,7 +523,7 @@ function initNavTree(toroot,relpath,allMembersFile) {
       const table = item.groupHeader.parents('table.memberdecls');
       let rows = $();
       if (table.length>0) {
-        rows = table.find("tr[class^='memitem:'] td.memItemRight a, tr[class^='memitem:'] td.memItemLeft.anon a, tr[class=groupHeader] td div.groupHeader");
+        rows = table.find("tr[class^='memitem:'] td.memItemRight, tr[class^='memitem:'] td.memItemLeft.anon, tr[class=groupHeader] td");
       }
       function hasSubItems() {
         return item.memTitles.length>0 || rows.toArray().some(function(el) { return $(el).is(':visible'); });
@@ -540,14 +540,14 @@ function initNavTree(toroot,relpath,allMembersFile) {
         let inMemberGroup = false;
         // declaration sections have rows for items
         rows.each(function(){
-          let td = $(this).parent();
+          let td = $(this);
           let tr = $(td).parent();
           const is_anon_enum = td.contents().first().text().trim()=='{';
           if (tr.hasClass('template')) {
             tr = tr.prev();
           }
           id = $(tr).attr('id');
-          text = is_anon_enum ? 'anonymous enum' : $(this).text();
+          text = is_anon_enum ? 'anonymous enum' : $(this).find('a,b,div.groupHeader').text();
           let isMemberGroupHeader = $(tr).hasClass('groupHeader');
           if ($(tr).is(":visible") && last_id!=id) {
             if (isMemberGroupHeader && inMemberGroup) {