summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2012-07-12 15:32:41 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2012-07-12 15:32:41 (GMT)
commit52445a98210e9aa50b3fd4bb36995e117539e490 (patch)
tree84ec1ff38937e82a2dfe563fc2d140bc337ffd7f /src/commentscan.l
parent0ce3aea886f4e95da56d164b3944fd54d3d68f89 (diff)
downloadDoxygen-52445a98210e9aa50b3fd4bb36995e117539e490.zip
Doxygen-52445a98210e9aa50b3fd4bb36995e117539e490.tar.gz
Doxygen-52445a98210e9aa50b3fd4bb36995e117539e490.tar.bz2
Release-1.8.1.2
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 26c381f..b44bd70 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -970,6 +970,14 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
<Comment>"</remarks>" { // end of a brief or detailed description
addOutput(yytext);
}
+<Comment>"<"{PRE}{ATTR}">" {
+ insidePre=TRUE;
+ addOutput(yytext);
+ }
+<Comment>"</"{PRE}">" {
+ insidePre=FALSE;
+ addOutput(yytext);
+ }
<Comment>{RCSTAG} { // RCS tag which end a brief description
setOutput(OutputDoc);
REJECT;
@@ -1115,10 +1123,10 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
addOutput(yytext);
}
<Comment>"---" { // mdash
- addOutput("&mdash;");
+ addOutput(insidePre || Doxygen::markdownSupport ? yytext : "&mdash;");
}
<Comment>"--" { // ndash
- addOutput("&ndash;");
+ addOutput(insidePre || Doxygen::markdownSupport ? yytext : "&ndash;");
}
<Comment>("."+)[a-z_A-Z0-9\)] { // . at start or in the middle of a word, or ellipsis
addOutput(yytext);
@@ -2672,7 +2680,7 @@ bool parseCommentBlock(/* in */ ParserInterface *parser,
}
Debug::print(Debug::CommentScan,0,"-----------\nCommentScanner: %s:%d\n"
- "input=[%s]\n",fileName.data(),lineNr,comment.data()
+ "input=[\n%s]\n",fileName.data(),lineNr,comment.data()
);
commentScanYYrestart( commentScanYYin );