In HTML the @image title did not appear as tooltip and quotes were no…

…t properly escaped
doxygen · Dec 27, 2021 · 8df4e9f · 8df4e9f · doxygen · Dec 27, 2021
1 parent 618c596
commit 8df4e9f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp
@@ -277,8 +277,7 @@ static QCString htmlAttribsToString(const HtmlAttribList &attribs, QCString *pAl
 
 HtmlDocVisitor::HtmlDocVisitor(TextStream &t,CodeOutputInterface &ci,
                                const Definition *ctx)
-  : DocVisitor(DocVisitor_Html), m_t(t), m_ci(ci), m_insidePre(FALSE),
-                                 m_hide(FALSE), m_ctx(ctx)
+  : DocVisitor(DocVisitor_Html), m_t(t), m_ci(ci), m_ctx(ctx)
 {
   if (ctx) m_langExt=ctx->getDefFileExtension();
 }
@@ -319,14 +318,22 @@ void HtmlDocVisitor::visit(DocWhiteSpace *w)
 void HtmlDocVisitor::visit(DocSymbol *s)
 {
   if (m_hide) return;
-  const char *res = HtmlEntityMapper::instance()->html(s->symbol());
-  if (res)
+  if (m_insideTitle &&
+      (s->symbol()==DocSymbol::Sym_Quot || s->symbol()==DocSymbol::Sym_quot)) // escape "'s inside title="..."
   {
-    m_t << res;
+    m_t << "&quot;";
   }
   else
   {
-    err("HTML: non supported HTML-entity found: %s\n",HtmlEntityMapper::instance()->html(s->symbol(),TRUE));
+    const char *res = HtmlEntityMapper::instance()->html(s->symbol());
+    if (res)
+    {
+      m_t << res;
+    }
+    else
+    {
+      err("HTML: non supported HTML-entity found: %s\n",HtmlEntityMapper::instance()->html(s->symbol(),TRUE));
+    }
   }
 }
 
@@ -1784,6 +1791,7 @@ void HtmlDocVisitor::visitPre(DocImage *img)
       if (inlineImage)
       {
         m_t << " title=\"";
+        m_insideTitle=true;
       }
       else
       {
@@ -1813,6 +1821,7 @@ void HtmlDocVisitor::visitPost(DocImage *img)
       if (inlineImage)
       {
         m_t << "\"/>";
+        m_insideTitle=false;
       }
       else // end <div class="caption">
       {

diff --git a/src/htmldocvisitor.h b/src/htmldocvisitor.h
@@ -163,8 +163,9 @@ class HtmlDocVisitor : public DocVisitor
 
     TextStream &m_t;
     CodeOutputInterface &m_ci;
-    bool m_insidePre;
-    bool m_hide;
+    bool m_insidePre = false;
+    bool m_hide = false;
+    bool m_insideTitle = false;
     const Definition *m_ctx;
     QCString m_langExt;
 };

diff --git a/src/markdown.cpp b/src/markdown.cpp
@@ -1291,11 +1291,11 @@ int Markdown::processLink(const char *data,int offset,int size)
         }
         else if (data[i]=='\\') // escaped char in string
         {
-          i++; 
+          i++;
         }
         else if (data[i]==c)
         {
-          i++; 
+          i++;
           break;
         }
         i++;
@@ -1311,7 +1311,7 @@ int Markdown::processLink(const char *data,int offset,int size)
       if (data[titleEnd]==c) // found it
       {
         convertStringFragment(title,data+titleStart,titleEnd-titleStart);
-        //printf("processLink: title={%s}\n",qPrint(title));
+        explicitTitle=TRUE;
         while (i<size)
         {
           if (data[i]==' ')i++; // remove space after the closing quote and the closing bracket