summaryrefslogtreecommitdiffstats
path: root/src/commentscan.l
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-03-24 20:39:59 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-03-24 20:39:59 (GMT)
commiteb1cb68e11a3b24222a49ed254f8f7aea2f73bae (patch)
tree1e47a4443afb2ec61f032669050ee1b8834baa8d /src/commentscan.l
parentcd19d7a220915d1f637e0a0a5b2d05d5750f5db0 (diff)
downloadDoxygen-eb1cb68e11a3b24222a49ed254f8f7aea2f73bae.zip
Doxygen-eb1cb68e11a3b24222a49ed254f8f7aea2f73bae.tar.gz
Doxygen-eb1cb68e11a3b24222a49ed254f8f7aea2f73bae.tar.bz2
Release-1.6.3-20100324
Diffstat (limited to 'src/commentscan.l')
-rw-r--r--src/commentscan.l16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 5306075..902a4f4 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1031,13 +1031,25 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
<Comment>".," { // . with comma such as "e.g.,"
addOutput(yytext);
}
+<Comment>"...\\"[ \t] { // ellipsis with escaped space.
+ addOutput("... ");
+ }
+<Comment>".."[\.]?/[^ \t\n] { // internal ellipsis
+ addOutput(yytext);
+ }
<Comment>(\n|\\_linebr)({B}*(\n|\\_linebr))+ { // at least one blank line (or blank line command)
- if (inContext!=OutputBrief)
+ if (inContext==OutputXRef)
+ {
+ // see bug 613024, we need to put the newlines after ending the XRef section.
+ setOutput(OutputDoc);
+ addOutput("\n\n");
+ }
+ else if (inContext!=OutputBrief)
{
addOutput("\n\n");
setOutput(OutputDoc);
}
- else
+ else // inContext==OutputBrief
{ // only go to the detailed description if we have
// found some brief description and not just whitespace
endBrief(FALSE);