diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-07-13 18:39:40 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-07-13 18:39:40 (GMT) |
| commit | 319a70f698fbd365006aa32ab1afa458e44b39f0 (patch) | |
| tree | e39f47d6e20acce02abe996f6db7de5aac15c536 | |
| parent | 5f428d7b868cd93b846dcb7ea8dfa3bff98ea9c5 (diff) | |
| parent | 69df2f9d1deb87b79c79f9ea1bf20380ff9b71ad (diff) | |
| download | Doxygen-319a70f698fbd365006aa32ab1afa458e44b39f0.zip Doxygen-319a70f698fbd365006aa32ab1afa458e44b39f0.tar.gz Doxygen-319a70f698fbd365006aa32ab1afa458e44b39f0.tar.bz2 | |
Merge pull request #196 from albert-github/feature/bug_702584_2
Bug 702584 - \cite rejects valid BibTeX keys
| -rw-r--r-- | src/commentscan.l | 4 | ||||
| -rw-r--r-- | src/doctokenizer.l | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index bd20bf0..a42f6ce 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -914,7 +914,9 @@ FILEECHAR [a-z_A-Z0-9\x80-\xFF\-\+@&#] FILE ({FILESCHAR}*{FILEECHAR}+("."{FILESCHAR}*{FILEECHAR}+)*)|("\""[^\n\"]*"\"") 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\-:/]* +CITESCHAR [a-z_A-Z\x80-\xFF] +CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/]* +CITEID {CITESCHAR}*{CITEECHAR}+("."{CITESCHAR}*{CITEECHAR}+)* SCOPEID {ID}({ID}*{BN}*"::"{BN}*)*({ID}?) SCOPENAME "$"?(({ID}?{BN}*("::"|"."){BN}*)*)((~{BN}*)?{ID}) TMPLSPEC "<"{BN}*[^>]+{BN}*">" diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 7ffbbb3..3bd2058 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -333,7 +333,9 @@ 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\-]* PHPTYPE [\\:a-z_A-Z0-9\x80-\xFF\-]+ -CITEID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-:/]* +CITESCHAR [a-z_A-Z\x80-\xFF] +CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/]* +CITEID {CITESCHAR}*{CITEECHAR}+("."{CITESCHAR}*{CITEECHAR}+)* MAILADR ("mailto:")?[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}*[-]("#")?{WS} |