Skip to content

Commit 1fc975e

Browse files
authored
Merge pull request doxygen#11385 from albert-github/feature/issue_11310
issue doxygen#11310 "^^" in aliases not proper evaluated
2 parents 64d0cb7 + 26c9dce commit 1fc975e

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/commentcnv.l

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ SLASHopt [/]*
561561
yyextra->inVerbatim=true;
562562
BEGIN(VerbatimCode);
563563
}
564-
<CComment,ReadLine,IncludeFile>"\\ilinebr"[ \t]+("```"[`]*|"~~~"[~]*) { /* start of markdown code block */
564+
<CComment,ReadLine,IncludeFile>{CMD}"ilinebr"[ \t]+("```"[`]*|"~~~"[~]*) { /* start of markdown code block */
565565
if (!Config_getBool(MARKDOWN_SUPPORT))
566566
{
567567
REJECT;
@@ -1070,7 +1070,7 @@ SLASHopt [/]*
10701070
<ReadLine,CopyLine>{RL} {
10711071
copyToOutput(yyscanner,yytext,yyleng);
10721072
}
1073-
<ReadLine,CopyLine>{RL}/{B}"\\ilinebr"{B} {
1073+
<ReadLine,CopyLine>{RL}/{B}{CMD}"ilinebr"{B} {
10741074
copyToOutput(yyscanner,yytext,yyleng);
10751075
}
10761076
<ReadLine,CopyLine>{RLopt}/\n {
@@ -1132,13 +1132,13 @@ SLASHopt [/]*
11321132
yyextra->snippetName = "";
11331133
BEGIN(SnippetDocTag);
11341134
}
1135-
<SnippetDocTag>[^\\\n]+ {
1135+
<SnippetDocTag>[^\\@\n]+ {
11361136
yyextra->snippetName += yytext;
11371137
}
1138-
<SnippetDocTag>"\\" {
1138+
<SnippetDocTag>{CMD} {
11391139
yyextra->snippetName += yytext;
11401140
}
1141-
<SnippetDocTag>(\n|"\\ilinebr") {
1141+
<SnippetDocTag>(\n|{CMD}"ilinebr") {
11421142
for (int i=(int)yyleng-1;i>=0;i--) unput(yytext[i]);
11431143
yyextra->snippetName = yyextra->snippetName.stripWhiteSpace();
11441144
QCString blockId = "["+yyextra->snippetName+"]";
@@ -1204,7 +1204,7 @@ SLASHopt [/]*
12041204
<CComment,ReadLine,IncludeFile,Verbatim,VerbatimCode>[\\@][a-z_A-Z][a-z_A-Z0-9-]* { // expand alias without arguments
12051205
replaceAliases(yyscanner,yytext,YY_START==ReadLine && yyextra->readLineCtx==SComment);
12061206
}
1207-
<CComment,ReadLine,IncludeFile,Verbatim,VerbatimCode>{B}?"\\ilinebr"{B}[\\@]"ialias{" { // expand alias with arguments
1207+
<CComment,ReadLine,IncludeFile,Verbatim,VerbatimCode>{B}?{CMD}"ilinebr"{B}[\\@]"ialias{" { // expand alias with arguments
12081208
yyextra->lastBlockContext=YY_START;
12091209
yyextra->blockCount=1;
12101210
int extraSpace = (yytext[0]==' '? 1:0);

src/markdown.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3640,7 +3640,7 @@ void MarkdownOutlineParser::parseInput(const QCString &fileName,
36403640
current->fileName = fileName;
36413641
current->docFile = fileName;
36423642
current->docLine = 1;
3643-
QCString docs = fileBuf;
3643+
QCString docs = stripIndentation(fileBuf);
36443644
Debug::print(Debug::Markdown,0,"======== Markdown =========\n---- input ------- \n{}\n",fileBuf);
36453645
QCString id;
36463646
Markdown markdown(fileName,1,0);

0 commit comments

Comments
 (0)