diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-03 20:11:10 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2014-09-03 20:11:10 (GMT) |
| commit | df2763693ccbacb3c62b9e9956494d6742fcbd9d (patch) | |
| tree | 69572a144667b724486ec4fdf5dd2ee2d3c8f3a0 | |
| parent | 94c3142271fb2a9172f0e2873e929d1856ae8167 (diff) | |
| parent | f0338dbf3a8770a6120eab83b338e6e3c3427a0e (diff) | |
| download | Doxygen-df2763693ccbacb3c62b9e9956494d6742fcbd9d.zip Doxygen-df2763693ccbacb3c62b9e9956494d6742fcbd9d.tar.gz Doxygen-df2763693ccbacb3c62b9e9956494d6742fcbd9d.tar.bz2 | |
Merge pull request #220 from albert-github/feature/bug_cite_key
Problem in case of line termination (., a dot) direct after the \cite command
| -rw-r--r-- | src/commentscan.l | 2 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 |
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} |