Merge pull request #10861 from albert-github/feature/issue_10858

issue #10958 Markdown: unordered list
doxygen · May 12, 2024 · 3e1f855 · 3e1f855
2 parents 840cae9 + 3bf32a6
commit 3e1f855
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/commentcnv.l b/src/commentcnv.l
@@ -1697,6 +1697,7 @@ static bool readIncludeFile(yyscan_t yyscanner,const QCString &inc,const QCStrin
     QCString oldRaiseLabel = yyextra->raiseLabel;
     yyextra->raiseLevel+=yyextra->raiseIncrement;
     yyextra->raiseLabel+=yyextra->raisePrefix;
+    lineNr--;
     QCString lineStr=" \\ilinebr \\ifile \""+absFileName+"\" \\iline " + std::to_string(lineNr);
     if (yyextra->raiseLevel>0)
     {
@@ -1706,12 +1707,14 @@ static bool readIncludeFile(yyscan_t yyscanner,const QCString &inc,const QCStrin
     {
       lineStr+=" \\iprefix \"" + yyextra->raiseLabel + "\"";
     }
-    lineStr+=" \\ilinebr ";
+    copyToOutput(yyscanner,lineStr.view());
+    insertCommentStart(yyscanner);
+    lineStr="\n";
     copyToOutput(yyscanner,lineStr.view());
 
     fs->fileName      = absFileName;
     fs->bufState      = YY_CURRENT_BUFFER;
-    fs->oldLineNr     = yyextra->lineNr;
+    fs->oldLineNr     = yyextra->lineNr-1;
     fs->oldFileName   = yyextra->fileName;
     fs->oldState      = yyextra->includeCtx;
     fs->oldFileBuf    = yyextra->inBuf;

diff --git a/src/doctokenizer.l b/src/doctokenizer.l
@@ -348,7 +348,7 @@ REFWORD4       {REFWORD4_NOCV}{CVSPEC}?
 REFWORD        {FILEMASK}|{LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
 REFWORD_NOCV   {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
 RCSID "$"("Author"|"Date"|"Header"|"Id"|"Locker"|"Log"|"Name"|"RCSfile"|"Revision"|"Source"|"State")":"[^:\n$][^\n$]*"$"
-LINENR {BLANK}*[1-9][0-9]*
+LINENR {BLANK}*([1-9][0-9]*|"0")
 
 SHOWDATE ([0-9]{4}"-"[0-9]{1,2}"-"[0-9]{1,2})?({WS}*[0-9]{1,2}":"[0-9]{1,2}(":"[0-9]{1,2})?)?