Merge branch 'albert-github-feature/issue_11647'

Author: doxygen

src/searchindex_js.cpp

@@ -558,7 +558,7 @@ static void writeJavascriptSearchData(const QCString &searchDirName)
       if (!sii.symbolMap.empty())
       {
         if (j>0) t << ",\n";
-        t << "  " << j << ": \"" << sii.name << "\"";
+        t << "  " << j << ": \"" << convertToJSString(sii.name,true,false) << "\"";
         j++;
       }
     }
@@ -572,7 +572,7 @@ static void writeJavascriptSearchData(const QCString &searchDirName)
       if (!sii.symbolMap.empty())
       {
         if (j>0) t << ",\n";
-        t << "  " << j << ": \"" << convertToXML(sii.getText()) << "\"";
+        t << "  " << j << ": \"" << convertToJSString(convertToXML(sii.getText()),true,false) << "\"";
         j++;
       }
     }
@@ -653,11 +653,11 @@ static void writeJavasScriptSearchDataPage(const QCString &baseName,const QCStri
       ti << "  ['" << id << "_" << cnt++ << "',['";
       if (next==SearchTerm::LinkInfo() || it->word!=word) // unique result, show title
       {
-        ti << convertToXML(term.title);
+        ti << convertToJSString(convertToXML(term.title),true,true);
       }
       else // multiple results, show matching word only, expanded list will show title
       {
-        ti << convertToXML(term.word);
+        ti << convertToJSString(convertToXML(term.word),true,true);
       }
       ti << "',[";
       childCount=0;
@@ -671,12 +671,12 @@ static void writeJavasScriptSearchDataPage(const QCString &baseName,const QCStri
     QCString fn  = d ? d->getOutputFileBase() : si ? si->fileName() : QCString();
     QCString ref = d ? d->getReference()      : si ? si->ref()      : QCString();
     addHtmlExtensionIfMissing(fn);
-    ti << "'" << externalRef("../",ref,TRUE) << fn;
+    QCString extRef = externalRef("../",ref,true)+fn;
     if (!anchor.isEmpty())
     {
-      ti << "#" << anchor;
+      extRef+="#"+anchor;
     }
-    ti << "',";
+    ti << "'" << convertToJSString(extRef,true,true) << "',";
 
     bool extLinksInWindow = Config_getBool(EXT_LINKS_IN_WINDOW);
     if (!extLinksInWindow || ref.isEmpty())
@@ -692,15 +692,15 @@ static void writeJavasScriptSearchDataPage(const QCString &baseName,const QCStri
     {
       if (d && d->getOuterScope()!=Doxygen::globalScope)
       {
-        ti << "'" << convertToXML(d->getOuterScope()->name()) << "'";
+        ti << "'" << convertToJSString(convertToXML(d->getOuterScope()->name()),true,true) << "'";
       }
       else if (md)
       {
         const FileDef *fd = md->getBodyDef();
         if (fd==nullptr) fd = md->getFileDef();
         if (fd)
         {
-          ti << "'" << convertToXML(fd->localName()) << "'";
+          ti << "'" << convertToJSString(convertToXML(fd->localName()),true,true) << "'";
         }
       }
       else
@@ -753,7 +753,8 @@ static void writeJavasScriptSearchDataPage(const QCString &baseName,const QCStri
               // member in class or namespace scope
             {
               SrcLangExt lang = md->getLanguage();
-              name = convertToXML(d->getOuterScope()->qualifiedName()) + getLanguageSpecificSeparator(lang) + prefix;
+              QCString sep = getLanguageSpecificSeparator(lang);
+              name = convertToXML(d->getOuterScope()->qualifiedName()) + sep + prefix;
               found = true;
             }
             else if (scope) // some thing else? -> show scope
@@ -775,7 +776,7 @@ static void writeJavasScriptSearchDataPage(const QCString &baseName,const QCStri
         name = prefix + "("+theTranslator->trGlobalNamespace()+")";
       }
 
-      ti << "'" << name << "'";
+      ti << "'" << convertToJSString(name,true,true) << "'";
 
       prevScope = scope;
       childCount++;

src/util.cpp

@@ -4534,7 +4534,7 @@ QCString convertToHtml(const QCString &s,bool keepEntities)
   return growBuf.get();
 }
 
-QCString convertToJSString(const QCString &s,bool keepEntities)
+QCString convertToJSString(const QCString &s,bool keepEntities,bool singleQuotes)
 {
   if (s.isEmpty()) return s;
   GrowBuf growBuf;
@@ -4544,8 +4544,11 @@ QCString convertToJSString(const QCString &s,bool keepEntities)
   {
     switch (c)
     {
-      case '"':  growBuf.addStr("\\\""); break;
-      case '\\': if (*p=='u' && *(p+1)=='{') growBuf.addStr("\\");
+      case '"':  if (!singleQuotes) growBuf.addStr("\\\""); else growBuf.addChar(c);
+                 break;
+      case '\'': if (singleQuotes) growBuf.addStr("\\\'"); else growBuf.addChar(c);
+                 break;
+      case '\\': if (*p=='u' && *(p+1)=='{') growBuf.addStr("\\"); // keep \u{..} unicode escapes
                  else growBuf.addStr("\\\\");
                  break;
       default:   growBuf.addChar(c);   break;

src/util.h

@@ -277,7 +277,7 @@ QCString convertToHtml(const QCString &s,bool keepEntities=true);
 
 QCString convertToXML(const QCString &s, bool keepEntities=false);
 
-QCString convertToJSString(const QCString &s,bool keepEntities=false);
+QCString convertToJSString(const QCString &s,bool keepEntities=false,bool singleQuotes=false);
 
 QCString getOverloadDocs();