Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Allow digit as first character of a citation key.

Browse source 
* Update parser to recognize citation keys starting with a digit.
* Update documentation accordingly.
* Test case added.

See https://github.com/jgm/pandoc-citeproc/issues/97
This commit is contained in:
Matthias C. M. Troffaes 2015-02-18 13:54:25 +00:00
parent 3480189e8e
commit dccd408a9c
3 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README
View file

@ -2616,7 +2616,7 @@ can be found at <https://github.com/citation-style-language/styles>. See also
Citations go inside square brackets and are separated by semicolons. Citations go inside square brackets and are separated by semicolons.
Each citation must have a key, composed of '@' + the citation Each citation must have a key, composed of '@' + the citation
identifier from the database, and may optionally have a prefix, 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 or `_`, and may contain alphanumerics, `_`, and internal punctuation
characters (`:.#$%&-+?<>~/`). Here are some examples: characters (`:.#$%&-+?<>~/`). Here are some examples:

2
src/Text/Pandoc/Parsing.hs
View file

@ -1212,7 +1212,7 @@ citeKey = try $ do
guard =<< notAfterString guard =<< notAfterString
suppress_author <- option False (char '-' *> return True) suppress_author <- option False (char '-' *> return True)
char '@' char '@'
firstChar <- letter <|> char '_' firstChar <- alphaNum <|> char '_'
let regchar = satisfy (\c -> isAlphaNum c || c == '_') let regchar = satisfy (\c -> isAlphaNum c || c == '_')
let internal p = try $ p <* lookAhead regchar let internal p = try $ p <* lookAhead regchar
rest <- many $ regchar <|> internal (oneOf ":.#$%&-+?<>~/") rest <- many $ regchar <|> internal (oneOf ":.#$%&-+?<>~/")

22
tests/Tests/Readers/Markdown.hs
View file

@ -289,4 +289,26 @@ tests = [ testGroup "inline code"
, plain "b" , plain "b"
, plain "c" <> bulletList [plain "d"] ] , 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")
]
] ]