diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-01-11 14:40:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-11 14:40:59 (GMT) |
| commit | 1125bc70d6129108d9b2162f96e50a547f4d7dda (patch) | |
| tree | 6492307bf0eb8a2a75c01d713165f267e3142b92 /src | |
| parent | 62a49f5eed87709c6aa0688d67d40304bdc007eb (diff) | |
| parent | 93a6f04ac6f9df7c66b704b24383e3d239fc7c17 (diff) | |
| download | Doxygen-1125bc70d6129108d9b2162f96e50a547f4d7dda.zip Doxygen-1125bc70d6129108d9b2162f96e50a547f4d7dda.tar.gz Doxygen-1125bc70d6129108d9b2162f96e50a547f4d7dda.tar.bz2 | |
Merge pull request #7497 from albert-github/feature/bug_consistency_only
Consistency `\*only` and `\end*only` commands
Diffstat (limited to 'src')
| -rw-r--r-- | src/doctokenizer.l | 8 | ||||
| -rw-r--r-- | src/scanner.l | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 4882570..11e96d6 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1296,6 +1296,14 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_endMarker="endlatexonly"; BEGIN(St_SecSkip); } +<St_Sections>{CMD}"manonly"/[^a-z_A-Z0-9] { + g_endMarker="endmanonly"; + BEGIN(St_SecSkip); + } +<St_Sections>{CMD}"rtfonly"/[^a-z_A-Z0-9] { + g_endMarker="endrtfonly"; + BEGIN(St_SecSkip); + } <St_Sections>{CMD}"xmlonly"/[^a-z_A-Z0-9] { g_endMarker="endxmlonly"; BEGIN(St_SecSkip); diff --git a/src/scanner.l b/src/scanner.l index 44c7c78..00ba8a7 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -4274,7 +4274,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) unput(yyextra->lastCopyArgChar); BEGIN( yyextra->lastCommentInArgContext ); } -<CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!) +<CopyArgCommentLine>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!) yyextra->docBlockName=&yytext[1]; yyextra->fullArgString+=yytext; BEGIN(CopyArgVerbatim); @@ -4292,7 +4292,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) yyextra->fullArgString+=yytext; BEGIN(CopyArgVerbatim); } -<CopyArgVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode"|"f$"|"f]"|"f}")/[^a-z_A-Z0-9\-] { // end of verbatim block +<CopyArgVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"endrtfonly"|"enddot"|"endcode"|"f$"|"f]"|"f}")/[^a-z_A-Z0-9\-] { // end of verbatim block yyextra->fullArgString+=yytext; if (yytext[1]=='f') // end of formula { @@ -6252,7 +6252,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) yyextra->nestedComment=FALSE; BEGIN(DocCopyBlock); } -<DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!) +<DocBlock>{CMD}("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"manonly"|"rtfonly"|"docbookonly"|"dot"|"code")/[^a-z_A-Z0-9\-] { // verbatim command (which could contain nested comments!) yyextra->docBlock+=yytext; yyextra->docBlockName=&yytext[1]; yyextra->fencedSize=0; @@ -6320,7 +6320,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) yyextra->docBlock+=yytext; BEGIN(DocBlock); } -<DocCopyBlock>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"enddot"|"endcode")/[^a-z_A-Z0-9] { // end of verbatim block +<DocCopyBlock>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endmanonly"|"endrtfonly"|"enddot"|"endcode")/[^a-z_A-Z0-9] { // end of verbatim block yyextra->docBlock+=yytext; if (&yytext[4]==yyextra->docBlockName) { |