diff options
| author | albert-github <albert.tests@gmail.com> | 2014-07-06 15:53:37 (GMT) |
|---|---|---|
| committer | albert-github <albert.tests@gmail.com> | 2014-07-06 15:53:37 (GMT) |
| commit | 69df2f9d1deb87b79c79f9ea1bf20380ff9b71ad (patch) | |
| tree | 1d8ee3c97e99e4930e77fd8e16537f3f18911499 | |
| parent | 070c35549da108695074239be3ab4268f3722261 (diff) | |
| download | Doxygen-69df2f9d1deb87b79c79f9ea1bf20380ff9b71ad.zip Doxygen-69df2f9d1deb87b79c79f9ea1bf20380ff9b71ad.tar.gz Doxygen-69df2f9d1deb87b79c79f9ea1bf20380ff9b71ad.tar.bz2 | |
Bug 702584 - \cite rejects valid BibTeX keys
Added possibility for . (dot) and + (bit analogous to file names. A . (dot) cannot be the last character)
| -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} |