summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2016-06-05 08:00:25 (GMT)
committeralbert-github <albert.tests@gmail.com>2016-06-05 08:00:25 (GMT)
commit36731bc9b573cdee6d699d0f66b4b34ad5b8f9ac (patch)
tree392987c07d439cc560b22f6930e3d004d693d1c3 /src
parent64597bbe46169c08b591a8714f48d314c5341cc2 (diff)
downloadDoxygen-36731bc9b573cdee6d699d0f66b4b34ad5b8f9ac.zip
Doxygen-36731bc9b573cdee6d699d0f66b4b34ad5b8f9ac.tar.gz
Doxygen-36731bc9b573cdee6d699d0f66b4b34ad5b8f9ac.tar.bz2
Bug 767171 - ALIASES stop working after verbatim with formula and /** */
A formula should not not end a "verbatim" type of block. A "verbatim" type of block should only stop at the corresponding end command. In case of a formula with an environment (i.e. f{) the name of the environment can be parsed separately. Corrected end condition for docbookonly.
Diffstat (limited to 'src')
-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);
}