issue doxygen#11557 @TableofContents shows <tt> tags for MarkDown headings with inline code

- properly process section/page/group titles for the search results
- keep section formatting in page outline panel as well

Author: doxygen

src/searchindex_js.cpp

@@ -37,22 +37,60 @@
 #include "threadpool.h"
 #include "moduledef.h"
 #include "section.h"
+#include "htmldocvisitor.h"
+#include "outputlist.h"
 
 //-------------------------------------------------------------------------------------------
 
+static std::mutex                               g_titleCacheMutex;
+static std::unordered_map<std::string,QCString> g_titleCache;
+
+static QCString convertTitleToHtml(const Definition *scope,const QCString &fileName,int lineNr,const QCString &title)
+{
+  std::lock_guard lock(g_titleCacheMutex);
+  auto it = g_titleCache.find(title.str());
+  if (it != g_titleCache.end())
+  {
+    //printf("Cache: [%s]->[%s]\n",qPrint(title),qPrint(it->second));
+    return it->second;
+  }
+  auto parser { createDocParser() };
+  auto ast    { validatingParseDoc(*parser.get(),fileName,lineNr,scope,nullptr,title,false,false,
+                                   QCString(),true,false,Config_getBool(MARKDOWN_SUPPORT)) };
+  auto astImpl = dynamic_cast<const DocNodeAST*>(ast.get());
+  QCString result;
+  if (astImpl)
+  {
+    TextStream t;
+    OutputCodeList codeList;
+    codeList.add<HtmlCodeGenerator>(&t);
+    HtmlDocVisitor visitor(t,codeList,scope,fileName);
+    std::visit(visitor,astImpl->root);
+    result = t.str();
+  }
+  else // fallback, should not happen
+  {
+    result = filterTitle(title);
+  }
+  //printf("Conversion: [%s]->[%s]\n",qPrint(title),qPrint(result));
+  g_titleCache.insert(std::make_pair(title.str(),result));
+  return result;
+}
+
 void SearchTerm::makeTitle()
 {
   if (std::holds_alternative<const Definition *>(info))
   {
     const Definition *def = std::get<const Definition *>(info);
     Definition::DefType type = def->definitionType();
-    title = type==Definition::TypeGroup ?  filterTitle(toGroupDef(def)->groupTitle()) :
-            type==Definition::TypePage  ?  filterTitle(toPageDef(def)->title()) :
+    title = type==Definition::TypeGroup ?  convertTitleToHtml(def,def->getDefFileName(),def->getDefLine(),toGroupDef(def)->groupTitle()) :
+            type==Definition::TypePage  ?  convertTitleToHtml(def,def->getDefFileName(),def->getDefLine(),toPageDef(def)->title()) :
                                            def->localName();
   }
   else if (std::holds_alternative<const SectionInfo *>(info))
   {
-    title = std::get<const SectionInfo *>(info)->title();
+    const SectionInfo *si = std::get<const SectionInfo *>(info);
+    title = convertTitleToHtml(si->definition(),si->fileName(),si->lineNr(),si->title());
   }
   else
   {

templates/html/navtree.js

@@ -792,7 +792,7 @@ function initNavTree(toroot,relpath,allMembersFile) {
       $('h1.doxsection, h2.doxsection, h3.doxsection, h4.doxsection, h5.doxsection, h6.doxsection').each(function(){
         const level = parseInt(this.tagName[1]);
         const anchor = $(this).find('a.anchor').attr('id');
-        const node = { text: $(this).text(), id: anchor, children: [] };
+        const node = { text: $(this).html(), id: anchor, children: [] };
         while (sectionStack.length && sectionStack[sectionStack.length - 1].level >= level) sectionStack.pop();
         (sectionStack.length ? sectionStack[sectionStack.length - 1].children : sectionTree).push(node);
         sectionStack.push({ ...node, level });
@@ -805,7 +805,7 @@ function initNavTree(toroot,relpath,allMembersFile) {
             const span = $('<span>').addClass('arrow').attr('style','padding-left:'+parseInt(level*16)+'px;');
             if (n.children.length > 0) { span.append($('<span>').addClass('arrowhead opened')); }
             const url = $('<a>').attr('href','#'+n.id);
-            content.append(li.append(div.append(span).append(url.append(escapeHtml(n.text)))));
+            content.append(li.append(div.append(span).append(url.append(n.text))));
             topMapping.push(n.id);
             render(n.children,level+1);
           });