diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-04-22 10:07:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-22 10:07:24 (GMT) |
| commit | e97ac0d521396eb089142d5f0dc056f1f4cdfcb7 (patch) | |
| tree | 77d7c1909983d71ceca0beb0981504efeb84d64d | |
| parent | 5adf9a5ce887ab06cb39c121cb846652e6523c68 (diff) | |
| parent | 5a9bfc176eb3da266f44bd5cb0b38975c812e49c (diff) | |
| download | Doxygen-e97ac0d521396eb089142d5f0dc056f1f4cdfcb7.zip Doxygen-e97ac0d521396eb089142d5f0dc056f1f4cdfcb7.tar.gz Doxygen-e97ac0d521396eb089142d5f0dc056f1f4cdfcb7.tar.bz2 | |
Merge pull request #704 from albert-github/feature/bug_704046
Bug 740046 - Negative sign in -Foo::Bar ruins hyperlink in generated output
| -rw-r--r-- | src/doctokenizer.l | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 777e963..e6b8865 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -387,7 +387,8 @@ LNKWORD2 (({SCOPEPRE}*"operator"{OPMASK})|({SCOPEPRE}"operator"{OPMASKOPT})|((" LNKWORD3 ([0-9a-z_A-Z\-]+("/"|"\\"))*[0-9a-z_A-Z\-]+("."[0-9a-z_A-Z]+)+ CHARWORDQ [^ \t\n\r\\@<>()\[\]:;\?{}&%$#,."='] ESCWORD ("%"{ID}(("::"|"."){ID})*)|("%'") -WORD1 {ESCWORD}|{CHARWORDQ}+|"{"|"}"|"'\"'"|("\""[^"\n]*\n?[^"\n]*"\"") +CHARWORDQ1 [^ \-+0-9\t\n\r\\@<>()\[\]:;\?{}&%$#,."='] +WORD1 {ESCWORD}|{CHARWORDQ1}+|"{"|"}"|"'\"'"|("\""[^"\n]*\n?[^"\n]*"\"") WORD2 "."|","|"("|")"|"["|"]"|":"|";"|"\?"|"="|"'" WORD1NQ {ESCWORD}|{CHARWORDQ}+|"{"|"}" WORD2NQ "."|","|"("|")"|"["|"]"|":"|";"|"\?"|"="|"'" @@ -696,6 +697,7 @@ REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} } /********* patterns for normal words ******************/ +<St_Para,St_Text>[\-+0-9] | <St_Para,St_Text>{WORD1} | <St_Para,St_Text>{WORD2} { /* function call */ if (yytext[0]=='%') // strip % if present @@ -931,6 +933,7 @@ REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} g_token->name = yytext; return TK_WORD; } +<St_TitleN>[\-+0-9] | <St_TitleN>{WORD1} | <St_TitleN>{WORD2} { /* word */ if (yytext[0]=='%') // strip % if present |