summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2016-06-20 19:07:10 (GMT)
committerGitHub <noreply@github.com>2016-06-20 19:07:10 (GMT)
commit8bbf7e266783c438d7ef3e424161857433916ec1 (patch)
treef85be20afe771b46750ba45e8b4938732ebd7cc0
parent10256be351f8f00ba5986750a08df1108bf6a4f7 (diff)
parent36731bc9b573cdee6d699d0f66b4b34ad5b8f9ac (diff)
downloadDoxygen-8bbf7e266783c438d7ef3e424161857433916ec1.zip
Doxygen-8bbf7e266783c438d7ef3e424161857433916ec1.tar.gz
Doxygen-8bbf7e266783c438d7ef3e424161857433916ec1.tar.bz2
Merge pull request #482 from albert-github/feature/bug_767171
Bug 767171 - ALIASES stop working after verbatim with formula and /** */
-rw-r--r--src/commentcnv.l6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l
index 169f66a..6409b0b 100644
--- a/src/commentcnv.l
+++ b/src/commentcnv.l
@@ -465,7 +465,7 @@ void replaceComment(int offset);
}
BEGIN(VerbatimCode);
}
-<CComment,ReadLine>[\\@]("f$"|"f["|"f{"[a-z]*) {
+<CComment,ReadLine>[\\@]("f$"|"f["|"f{") {
copyToOutput(yytext,(int)yyleng);
g_blockName=&yytext[1];
if (g_blockName.at(1)=='[')
@@ -488,9 +488,9 @@ void replaceComment(int offset);
<Scan>. { /* any ather character */
copyToOutput(yytext,(int)yyleng);
}
-<Verbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"docbookonly"|"endrtfonly"|"endmanonly"|"f$"|"f]"|"f}") { /* end of verbatim block */
+<Verbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"enddocbookonly"|"endrtfonly"|"endmanonly"|"f$"|"f]"|"f}") { /* end of verbatim block */
copyToOutput(yytext,(int)yyleng);
- if (yytext[1]=='f') // end of formula
+ if (&yytext[1]==g_blockName) // end of formula
{
BEGIN(g_lastCommentContext);
}