summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-05-08 20:42:05 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2000-05-08 20:42:05 (GMT)
commit6c268019f8ce8b58058e7f7f8204c82b8d0ac190 (patch)
tree28a24e8c88d32a50bc5bef6d49306553267dc5ab /src/scanner.l
parentb5fb0aa0f1c2a5373ed97b127e2daeeb81ab38f2 (diff)
downloadDoxygen-6c268019f8ce8b58058e7f7f8204c82b8d0ac190.zip
Doxygen-6c268019f8ce8b58058e7f7f8204c82b8d0ac190.tar.gz
Doxygen-6c268019f8ce8b58058e7f7f8204c82b8d0ac190.tar.bz2
Release-1.1.3
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l
index dea0bee..24047ea 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -830,7 +830,7 @@ static QCString findAndCopyImage(const char *fileName,ImageTypes type)
if (result.left(5)!="http:")
{
warn("Warning: image file %s is not found in IMAGE_PATH: "
- "assuming external image. ",fileName);
+ "assuming external image.\n",fileName);
}
}
return result;
@@ -877,7 +877,7 @@ ID [a-z_A-Z][a-z_A-Z0-9]*
SCOPEID {ID}({ID}*{BN}*"::"{BN}*)*({ID}?)
SCOPENAME (({ID}?{BN}*"::"{BN}*)*)((~{BN}*)?{ID})
SCOPEMASK {ID}?(("::"|"#")?(~)?{ID})+
-URLMASK [a-z_A-Z0-9\~\:\@\#\.\-\+\/]+
+URLMASK [a-z_A-Z0-9\~\:\?\@\#\.\-\+\/]+
NONTERM [\{\}\[\]\`\~\@\|\-\+\#\$\/\\\!\%\^\&\*()a-z_A-Z<>0-9]
WORD ({NONTERM}+([^\n\t ]*{NONTERM}+)?)|("\""[^\n\"]"\"")
ATTR ({B}+[^>\n]*)?
@@ -1125,6 +1125,9 @@ DOCPARAM ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
<DocScan>^{B}*(("//"{B}*)?)"*"*{B}*"-"{B}+ { /* found list item marker */
addListItemMarker(yytext);
}
+<DocScan>\n{B}*"-" {
+ addListItemMarker(yytext+1);
+ }
<DocScan>"<!--" { BEGIN(DocSkipHtmlComment); }
<DocSkipHtmlComment>"--"[!]?">" { BEGIN(DocScan); }
<DocSkipHtmlComment>.
@@ -3970,6 +3973,9 @@ DOCPARAM ([a-z_A-Z0-9:\.\-]+)|("\"".*"\"")
current->brief+=' ';
lineCount();
}
+<JavaDoc>".\\"/[ \t\r\n] {
+ current->brief+=".";
+ }
<JavaDoc>"."[ \t\r\n] {
lineCount();
current->brief+=".";