Fix regression due to move of markdown processing

doxygen · Dec 24, 2018 · 48e838a · 48e838a
1 parent c94a53e
commit 48e838a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/commentscan.l b/src/commentscan.l
@@ -1617,20 +1617,12 @@ RCSTAG    "$"{ID}":"[^\n$]+"$"
 
   /* --------- handle arguments of the param command ------------ */
 <ParamArg1>{ID}/{B}*","                 {
-                                          if (yytext[0]=='_' && Config_getBool(MARKDOWN_SUPPORT))
-                                          {
-                                            addOutput('\\');
-                                          }
                                           addOutput(yytext);
                                         }
 <ParamArg1>","                          {
                                           addOutput(" , ");
                                         }
 <ParamArg1>{ID}                         {
-                                          if (yytext[0]=='_' && Config_getBool(MARKDOWN_SUPPORT))
-                                          {
-                                            addOutput('\\');
-                                          }
                                           addOutput(yytext);
                                           BEGIN( Comment );
                                         }
@@ -3104,12 +3096,19 @@ bool parseCommentBlock(/* in */     ParserInterface *parser,
   if (comment.isEmpty()) return FALSE; // avoid empty strings
   if (Doxygen::markdownSupport)
   {
-    inputString      = processMarkdown(fileName,lineNr,NULL,comment);
-    QString qq(inputString);
-    while (qq.startsWith(" ")) qq = qq.mid(1);
-    while (qq.startsWith("\n")) qq = qq.mid(1);
-    if (qq.startsWith("<br>")) qq = qq.mid(4);
-    inputString = QCString(qq.data());
+    inputString = processMarkdown(fileName,lineNr,NULL,comment);
+    const char *p = inputString.data();
+    if (p)
+    {
+      while (*p==' ')  p++; // skip over spaces
+      while (*p=='\n') p++; // skip over newlines
+      if (qstrncmp(p,"<br>",4)==0) p+=4; // skip over <br>
+    }
+    if (p>inputString.data())
+    {
+      // strip part of the input
+      inputString = inputString.mid(p-inputString.data());
+    }
   }
   else
   {

diff --git a/src/docparser.cpp b/src/docparser.cpp
@@ -431,7 +431,7 @@ static void checkArgumentName(const QCString &name,bool isParam)
     }
     if (!found && isParam)
     {
-      //printf("member type=%d\n",memberDef->memberType());
+      //printf("member type=%d\n",g_memberDef->memberType());
       QCString scope=g_memberDef->getScopeString();
       if (!scope.isEmpty()) scope+="::"; else scope="";
       QCString inheritedFrom = "";