Fix for section selection range offset in page outline panel

Also fixes problem interpreting page titles with \<tag\> as <tag> in the navigation panel

Author: doxygen

src/ftvhelp.cpp

@@ -284,7 +284,8 @@ void FTVHelp::Private::generateLink(TextStream &t,const FTVNodePtr &n)
   //printf("FTVHelp::generateLink(ref=%s,file=%s,anchor=%s\n",
   //    qPrint(n->ref),qPrint(n->file),qPrint(n->anchor));
   bool setTarget = FALSE;
-  QCString text = n->nameAsHtml.isEmpty() ? convertToHtml(n->name) : n->nameAsHtml;
+  bool nameAsHtml = !n->nameAsHtml.isEmpty();
+  QCString text = nameAsHtml ? n->nameAsHtml : convertToHtml(n->name);
   if (n->file.isEmpty()) // no link
   {
     t << "<b>" << text << "</b>";
@@ -546,15 +547,17 @@ static bool dupOfParent(const FTVNodePtr &n)
 
 static void generateJSLink(TextStream &t,const FTVNodePtr &n)
 {
-  QCString result = n->nameAsHtml.isEmpty() ? n->name : n->nameAsHtml;
+  bool nameAsHtml = !n->nameAsHtml.isEmpty();
+  QCString result = nameAsHtml ? n->nameAsHtml : n->name;
+  QCString link = convertToJSString(result,nameAsHtml);
   if (n->file.isEmpty()) // no link
   {
-    t << "\"" << convertToJSString(result) << "\", null, ";
+    t << "\"" << link << "\", null, ";
   }
   else // link into other page
   {
     if (Config_getBool(HIDE_SCOPE_NAMES)) result=stripScope(result);
-    t << "\"" << convertToJSString(result) << "\", \"";
+    t << "\"" << link << "\", \"";
     t << externalRef("",n->ref,TRUE);
     t << node2URL(n);
     t << "\", ";

src/util.cpp

@@ -4537,7 +4537,7 @@ QCString convertToHtml(const QCString &s,bool keepEntities)
   return growBuf.get();
 }
 
-QCString convertToJSString(const QCString &s)
+QCString convertToJSString(const QCString &s,bool keepEntities)
 {
   if (s.isEmpty()) return s;
   GrowBuf growBuf;
@@ -4555,7 +4555,7 @@ QCString convertToJSString(const QCString &s)
     }
   }
   growBuf.addChar(0);
-  return convertCharEntitiesToUTF8(growBuf.get());
+  return keepEntities ? growBuf.get() : convertCharEntitiesToUTF8(growBuf.get());
 }
 
 QCString convertCharEntitiesToUTF8(const QCString &str)

src/util.h

@@ -273,11 +273,11 @@ QCString stripScope(const QCString &name);
 QCString convertToId(const QCString &s);
 QCString correctId(const QCString &s);
 
-QCString convertToHtml(const QCString &s,bool keepEntities=TRUE);
+QCString convertToHtml(const QCString &s,bool keepEntities=true);
 
-QCString convertToXML(const QCString &s, bool keepEntities=FALSE);
+QCString convertToXML(const QCString &s, bool keepEntities=false);
 
-QCString convertToJSString(const QCString &s);
+QCString convertToJSString(const QCString &s,bool keepEntities=false);
 
 QCString getOverloadDocs();
 

templates/html/navtree.js

@@ -846,7 +846,11 @@ function initNavTree(toroot,relpath,allMembersFile) {
         let offsets = []
         for (let i=0;i<topMapping.length;i++) {
           const heading = $('#'+topMapping[i]);
-          offsets.push({id:topMapping[i],y:heading.offset().top-yc});
+          if (heading.parent().hasClass('doxsection')) {
+            offsets.push({id:topMapping[i],y:heading.parent().offset().top-yc});
+          } else {
+            offsets.push({id:topMapping[i],y:heading.offset().top-yc});
+          }
         }
         offsets.push({id:'',y:1e10});
         let scrollTarget = undefined, numItems=0;
@@ -855,7 +859,8 @@ function initNavTree(toroot,relpath,allMembersFile) {
           const ye = offsets[i+1].y;
           const id = offsets[i].id;
           const nav = $('#nav-'+id);
-          if ((ys>2 || ye>2) && (ys<height-2 || ye<height-2)) {
+          const margin = 10; // #pixels before content show as visible
+          if ((ys>margin || ye>margin) && (ys<height-margin || ye<height-margin)) {
             if (!scrollTarget) scrollTarget=nav;
             nav.addClass('vis'); // mark navigation entry as visible within content area
             numItems+=1;