diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2015-04-17 19:10:37 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2015-04-17 19:10:37 -0700 |
| commit | 28ca8566ab72e135d559e457e28d3f3f306a7b0e (patch) | |
| tree | ced14587477a16e1fbe0865f4e6c40342572d46f | |
| parent | 44fcc5f96e3f412337a98a1791a79b059579f78e (diff) | |
| parent | dccd408a9c22e9120dcf50f1c107bff71778ee45 (diff) | |
| download | pandoc-28ca8566ab72e135d559e457e28d3f3f306a7b0e.tar.gz | |
Merge pull request #1954 from mcmtroffaes/feature/citekey-firstchar-alphanum
Allow digit as first character of a citation key.
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 2 | ||||
| -rw-r--r-- | tests/Tests/Readers/Markdown.hs | 22 |
3 files changed, 24 insertions, 2 deletions
@@ -2733,7 +2733,7 @@ modifying CSL styles can be found at Citations go inside square brackets and are separated by semicolons. Each citation must have a key, composed of '@' + the citation identifier from the database, and may optionally have a prefix, -a locator, and a suffix. The citation key must begin with a letter +a locator, and a suffix. The citation key must begin with a letter, digit, or `_`, and may contain alphanumerics, `_`, and internal punctuation characters (`:.#$%&-+?<>~/`). Here are some examples: diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index d30c74230..33120e55d 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -1191,7 +1191,7 @@ citeKey = try $ do guard =<< notAfterString suppress_author <- option False (char '-' *> return True) char '@' - firstChar <- letter <|> char '_' + firstChar <- alphaNum <|> char '_' let regchar = satisfy (\c -> isAlphaNum c || c == '_') let internal p = try $ p <* lookAhead regchar rest <- many $ regchar <|> internal (oneOf ":.#$%&-+?<>~/") diff --git a/tests/Tests/Readers/Markdown.hs b/tests/Tests/Readers/Markdown.hs index 6c8e9f306..1cc00fd5e 100644 --- a/tests/Tests/Readers/Markdown.hs +++ b/tests/Tests/Readers/Markdown.hs @@ -293,4 +293,26 @@ tests = [ testGroup "inline code" , plain "b" , plain "c" <> bulletList [plain "d"] ] ] + , testGroup "citations" + [ "simple" =: + "@item1" =?> para (cite [ + Citation{ citationId = "item1" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 0 + , citationHash = 0 + } + ] "@item1") + , "key starts with digit" =: + "@1657:huyghens" =?> para (cite [ + Citation{ citationId = "1657:huyghens" + , citationPrefix = [] + , citationSuffix = [] + , citationMode = AuthorInText + , citationNoteNum = 0 + , citationHash = 0 + } + ] "@1657:huyghens") + ] ] |