summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2014-09-03 16:56:23 (GMT)
committeralbert-github <albert.tests@gmail.com>2014-09-03 16:56:23 (GMT)
commitf0338dbf3a8770a6120eab83b338e6e3c3427a0e (patch)
tree510dc1b19a6811bd993c5b981b9bc5a92c2cf012
parent41887832b90698df95e8d222cdc0a541ae2f2284 (diff)
downloadDoxygen-f0338dbf3a8770a6120eab83b338e6e3c3427a0e.zip
Doxygen-f0338dbf3a8770a6120eab83b338e6e3c3427a0e.tar.gz
Doxygen-f0338dbf3a8770a6120eab83b338e6e3c3427a0e.tar.bz2
Problem in case of line termination (., a dot) direct after the \cite command
In case a sentence like: Cite reference at end of line with a dot \cite hicks2001. is used the cite_key is hicks2001. (so including the .) This is a regression of Bug 702584 - \cite rejects valid BibTeX keys
-rw-r--r--src/commentscan.l2
-rw-r--r--src/doctokenizer.l2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 168907f..3bfd563 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -917,7 +917,7 @@ 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\-]*
CITESCHAR [a-z_A-Z\x80-\xFF]
CITEECHAR [a-z_A-Z0-9\x80-\xFF\-\+:\/]*
-CITEID {CITESCHAR}*{CITEECHAR}+("."{CITESCHAR}*{CITEECHAR}+)*
+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 ea4a1a4..e0e72a7 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -335,7 +335,7 @@ LABELID [a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF\-]*
PHPTYPE [\\: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}+)*
+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}