diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-09-12 17:29:13 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-09-12 17:29:13 (GMT) |
| commit | 4ba2c6e68a9acc527d5ce26d367879667e805e07 (patch) | |
| tree | d99c9a9dc63b4fdf7ce10be8becd68c42ab36132 /src | |
| parent | 8e1481ecba4a028dcd7e6a083619d88c5944a87f (diff) | |
| parent | 2ba63156eac52c28827f2ed0d8fce3181f02e65b (diff) | |
| download | Doxygen-4ba2c6e68a9acc527d5ce26d367879667e805e07.zip Doxygen-4ba2c6e68a9acc527d5ce26d367879667e805e07.tar.gz Doxygen-4ba2c6e68a9acc527d5ce26d367879667e805e07.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/doctokenizer.l | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 311e445..4527855 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -353,6 +353,7 @@ ATTRNAME [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]* ATTRIB {ATTRNAME}{WS}*("="{WS}*(("\""[^\"]*"\"")|("'"[^\']*"'")|[^ \t\r\n'"><]+))? URLCHAR [a-z_A-Z0-9\!\~\,\:\;\'\$\?\@\&\%\#\.\-\+\/\=] URLMASK ({URLCHAR}+([({]{URLCHAR}*[)}])?)+ +URLPROTOCOL ("http:"|"https:"|"ftp:"|"file:"|"news:"|"irc") FILESCHAR [a-z_A-Z0-9\\:\\\/\-\+&#] FILEECHAR [a-z_A-Z0-9\-\+&#] HFILEMASK ("."{FILESCHAR}*{FILEECHAR}+)+ @@ -624,17 +625,17 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} } return TK_COMMAND_SEL(); } -<St_Para>("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK}/\. { // URL. +<St_Para>{URLPROTOCOL}{URLMASK}/\. { // URL. g_token->name=yytext; g_token->isEMailAddr=FALSE; return TK_URL; } -<St_Para>("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK} { // URL +<St_Para>{URLPROTOCOL}{URLMASK} { // URL g_token->name=yytext; g_token->isEMailAddr=FALSE; return TK_URL; } -<St_Para>"<"("http:"|"https:"|"ftp:"|"file:"|"news:"){URLMASK}">" { // URL +<St_Para>"<"{URLPROTOCOL}{URLMASK}">" { // URL g_token->name=yytext; g_token->name = g_token->name.mid(1,g_token->name.length()-2); g_token->isEMailAddr=FALSE; |