summaryrefslogtreecommitdiffstats
path: root/src/doctokenizer.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2011-09-25 13:05:36 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2011-09-25 13:05:36 (GMT)
commitbbcf980f4a694461bc9ea7bd2b92b8be3e1d4636 (patch)
tree5f64338de08ce72826ca0878c754638fed1587d4 /src/doctokenizer.l
parentd71a726489094c4fc1cf94f27a6eaa9a9f56a538 (diff)
downloadDoxygen-bbcf980f4a694461bc9ea7bd2b92b8be3e1d4636.zip
Doxygen-bbcf980f4a694461bc9ea7bd2b92b8be3e1d4636.tar.gz
Doxygen-bbcf980f4a694461bc9ea7bd2b92b8be3e1d4636.tar.bz2
Release-1.7.5.1-20110925
Diffstat (limited to 'src/doctokenizer.l')
-rw-r--r--src/doctokenizer.l7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index f68fd40..9fb6b2c 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -294,6 +294,7 @@ NONWS [^ \t\r\n]
BLANK [ \t\r]
ID "$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
LABELID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]*
+CITEID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-:/]*
MAILADR [a-z_A-Z0-9.+-]+"@"[a-z_A-Z0-9-]+("."[a-z_A-Z0-9\-]+)+[a-z_A-Z0-9\-]+
OPTSTARS ("//"{BLANK}*)?"*"*{BLANK}*
LISTITEM {BLANK}*{OPTSTARS}"-"("#")?{WS}
@@ -538,6 +539,10 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}
*/
goto find_rule;
}
+<St_Text>({ID}".")+{ID} {
+ g_token->name = yytext;
+ return TK_WORD;
+ }
<St_Para,St_Text>"operator"/{BLANK}*"<"[a-zA-Z_0-9]+">" { // Special case: word "operator" followed by a HTML command
// avoid interpretation as "operator <"
g_token->name = yytext;
@@ -735,7 +740,7 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}
unput(*yytext);
return 0;
}
-<St_Cite>{LABELID} { // label to cite
+<St_Cite>{CITEID} { // label to cite
g_token->name=yytext;
return TK_WORD;
}