diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-26 14:43:57 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-26 14:43:57 (GMT) |
| commit | 4377c7aee974aa25b79390a924e0d4debf928264 (patch) | |
| tree | 5dadd9d3fae88b0d9e37182ea073e60ebe3197a5 | |
| parent | a5c98ade388f4f18ec30476ca706760a8129c73f (diff) | |
| parent | d1e058b9c1f93aa0a986dbc8a754c5eabd747e27 (diff) | |
| download | Doxygen-4377c7aee974aa25b79390a924e0d4debf928264.zip Doxygen-4377c7aee974aa25b79390a924e0d4debf928264.tar.gz Doxygen-4377c7aee974aa25b79390a924e0d4debf928264.tar.bz2 | |
Merge branch 'albert-github-feature/bug_fenced_code'
| -rw-r--r-- | src/scanner.l | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/src/scanner.l b/src/scanner.l index 6ad0860..7b24d39 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6260,16 +6260,19 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) BEGIN(DocCopyBlock); } <DocBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* { - yyextra->docBlock+=substitute(yytext,"*"," "); + + QCString pat = substitute(yytext,"*"," "); + yyextra->docBlock+=pat; yyextra->docBlockName="~~~"; - yyextra->fencedSize=yyleng; + yyextra->fencedSize=pat.stripWhiteSpace().length(); yyextra->nestedComment=FALSE; BEGIN(DocCopyBlock); } <DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]* { - yyextra->docBlock+=substitute(yytext,"*"," "); + QCString pat = substitute(yytext,"*"," "); + yyextra->docBlock+=pat; yyextra->docBlockName="```"; - yyextra->fencedSize=yyleng; + yyextra->fencedSize=pat.stripWhiteSpace().length(); yyextra->nestedComment=FALSE; BEGIN(DocCopyBlock); } @@ -6385,15 +6388,17 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } } <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"~~~"[~]* { - yyextra->docBlock+=substitute(yytext,"*"," "); - if (yyextra->fencedSize==yyleng) + QCString pat = substitute(yytext,"*"," "); + yyextra->docBlock+=pat; + if (yyextra->fencedSize==pat.stripWhiteSpace().length()) { BEGIN(DocBlock); } } <DocCopyBlock>^({B}*"*"+)?{B}{0,3}"```"[`]* { - yyextra->docBlock+=substitute(yytext,"*"," "); - if (yyextra->fencedSize==yyleng) + QCString pat = substitute(yytext,"*"," "); + yyextra->docBlock+=pat; + if (yyextra->fencedSize==pat.stripWhiteSpace().length()) { BEGIN(DocBlock); } |