diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,32 @@ +pandoc-citeproc (0.7.4) + + * Bibliography Div has id `references`, in addition to class. + * Make sure a link with a year range encompasses the whole range. + Previously you'd get [LINK 1996]--[LINK 2003], where both + links went to the same citation. Now you get [LINK 1996-2003]. + (#146) + * Fix linking of DOIs (#163). Now only a part of a prefix that + begins a url (`http...`) will be part of the linked text for a DOI. + (This part will also be used for the URL, in place of the default + `http://doi.org/`, if present.) Other parts of the prefix and suffix + will remain outside the linked text. + * Use "literal" instead of "other" in producing CSL YAML (#167). + * Test suite: better technique to find right executable to test. + We now find the test program and locate pandoc-citeproc relative + to it. + * Change default for parse-names to False. + * Add `Paths_pandoc_citeproc` to other-modules. + * Allow flexible insertion of bibliography. + + If the document contains a Div element with id `references`, + the bibliography will be inserted in it (after any other content + in the Div). + + Otherwise, a Div with id `references` will be created at the + end of the document as before. + * Fix parsing of particles with hyphens on family names (#130). + * Handle `#+LINK_CITATIONS` metadata in org-mode. The values `true`, + `yes`, and `on` are recognized as true values (case-insensitive) + (#159). + pandoc-citeproc (0.7.3.1) * Moved tests from data-files to extra-source-files. diff --git a/man/man1/pandoc-citeproc.1 b/man/man1/pandoc-citeproc.1 --- a/man/man1/pandoc-citeproc.1 +++ b/man/man1/pandoc-citeproc.1 @@ -1,5 +1,5 @@ .\"t -.TH "pandoc\-citeproc" "1" "2015-06-10" "0.7.1.1" "" +.TH "pandoc\-citeproc" "1" "2015-08-29" "0.7.3.1" "" .SH NAME .PP pandoc\-citeproc \- filter to resolve citations in a pandoc document. @@ -15,9 +15,10 @@ Run without options, it acts as a filter that takes a JSON\-encoded Pandoc document, formats citations and adds a bibliography, and returns a JSON\-encoded pandoc document. -Citations will be resolved, and a bibliography will be appended to the -end of the document (unless the \f[C]suppress\-bibliography\f[] metadata -field is set to a true value). +Citations will be resolved, and a bibliography will be inserted into a +Div element with id \f[C]references\f[], if one exists, or appended to +the end of the document (unless the \f[C]suppress\-bibliography\f[] +metadata field is set to a true value). If you wish the bibliography to have a section header, put the section header at the end of your document. (See the \f[C]pandoc_markdown\f[] (5) man page under "Citations" for @@ -192,15 +193,15 @@ .TP .B \f[C]suppress\-bibliography\f[] If this has a true value, the bibliography will be left off. -Otherwise a bibliography will be added to the end of the document. +Otherwise a bibliography will be inserted into each Div element with id +\f[C]references\f[]. +If there is no such Div, one will be created at the end of the document. .RS .RE .TP .B \f[C]reference\-section\-title\f[] If this has a value, a section header with this title will be added before the bibliography. -Otherwise, the bibliography will simply be added to the end of the -document. If \f[C]reference\-section\-title\f[] is not specified and the document ends with a section header, this final header will be treated as the bibliography header. diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal --- a/pandoc-citeproc.cabal +++ b/pandoc-citeproc.cabal @@ -1,5 +1,5 @@ name: pandoc-citeproc -version: 0.7.3.1 +version: 0.7.4 cabal-version: >= 1.12 synopsis: Supports using pandoc with citeproc @@ -139,6 +139,7 @@ build-depends: base >= 4, pandoc-citeproc, pandoc-types >= 1.12.3, aeson, aeson-pretty, yaml, bytestring, syb, attoparsec, text, filepath + other-modules: Paths_pandoc_citeproc default-language: Haskell98 executable test-citeproc diff --git a/src/Text/CSL/Eval.hs b/src/Text/CSL/Eval.hs --- a/src/Text/CSL/Eval.hs +++ b/src/Text/CSL/Eval.hs @@ -30,6 +30,7 @@ import Text.Pandoc.Definition (Inline(Str, Space, Link)) import Text.Pandoc.Walk (walk) import Text.Pandoc.Shared (stringify) +import qualified Data.Text as T import Text.CSL.Eval.Common import Text.CSL.Eval.Output @@ -212,14 +213,15 @@ "locator" -> getLocVar >>= formatRange fm . snd "url" -> getStringVar "url" >>= \k -> if null k then return [] else return [Output [OPan [Link [Str k] (k,"")]] fm] - "doi" -> getStringVar "doi" >>= \d -> - if null d - then return [] - else do - return $ - [Output [OPan [Link [Str (prefix fm ++ d ++ suffix fm)] - ("http://doi.org/" ++ d, "")]] - fm{ prefix = "", suffix = "" }] + "doi" -> do d <- getStringVar "doi" + let (prefixPart, linkPart) = T.breakOn (T.pack "http") (T.pack (prefix fm)) + let u = if T.null linkPart + then "http://doi.org/" ++ d + else T.unpack linkPart ++ d + if null d + then return [] + else return [Output [OPan [Link [Str u] (u, "")]] + fm{ prefix = T.unpack prefixPart, suffix = suffix fm }] "pmid" -> getStringVar "pmid" >>= \d -> if null d then return [] @@ -340,9 +342,9 @@ roman = foldr (++) [] . reverse . map (uncurry (!!)) . zip romanList . map (readNum . return) . take 4 . reverse romanList = [[ "", "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix" ] - ,[ "", "x", "xx", "xxx", "xl", "l", "lx", "lxx", "lxxx", "xc" ] - ,[ "", "c", "cc", "ccc", "cd", "d", "dc", "dcc", "dccc", "cm" ] - ,[ "", "m", "mm", "mmm", "mmmm", "mmmmm"] + ,[ "", "x", "xx", "xxx", "xl", "l", "lx", "lxx", "lxxx", "xc" ] + ,[ "", "c", "cc", "ccc", "cd", "d", "dc", "dcc", "dccc", "cm" ] + ,[ "", "m", "mm", "mmm", "mmmm", "mmmmm"] ] diff --git a/src/Text/CSL/Input/Bibtex.hs b/src/Text/CSL/Input/Bibtex.hs --- a/src/Text/CSL/Input/Bibtex.hs +++ b/src/Text/CSL/Input/Bibtex.hs @@ -617,7 +617,7 @@ , nameSuffix = mempty , literal = Formatted [Str "others"] , commaSuffix = False - , parseNames = True + , parseNames = False } toAuthor _ [Span ("",[],[]) ils] = return $ -- corporate author @@ -628,7 +628,7 @@ , nameSuffix = mempty , literal = Formatted ils , commaSuffix = False - , parseNames = True + , parseNames = False } -- First von Last -- von Last, First @@ -681,7 +681,7 @@ , nameSuffix = suffix , literal = mempty , commaSuffix = usecomma - , parseNames = True + , parseNames = False } isCapitalized :: [Inline] -> Bool diff --git a/src/Text/CSL/Output/Pandoc.hs b/src/Text/CSL/Output/Pandoc.hs --- a/src/Text/CSL/Output/Pandoc.hs +++ b/src/Text/CSL/Output/Pandoc.hs @@ -42,6 +42,9 @@ clean' _ [] = [] clean' sty (i:is) = case (i:is) of + (Link lab1 ('#':r1, "") : Str "\8211" : Link lab2 ('#':r2, "") : rest) + | r1 == r2 -> Link (lab1 ++ [Str "\8211"] ++ lab2) ('#':r1, "") : + clean' sty rest (Span ("",[],[]) inls : _) -> inls ++ clean' sty is (Span ("",["csl-inquote"],kvs) inls : _) -> let isOuter = lookup "position" kvs == Just "outer" diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs --- a/src/Text/CSL/Pandoc.hs +++ b/src/Text/CSL/Pandoc.hs @@ -11,7 +11,7 @@ import System.SetEnv (setEnv) import Control.Applicative ((<|>)) import Data.Aeson -import Data.Char ( isDigit, isPunctuation, isSpace ) +import Data.Char ( isDigit, isPunctuation, toLower, isSpace ) import qualified Data.Map as M import Text.CSL.Reference hiding (processCites, Value) import Text.CSL.Input.Bibutils (readBiblioFile, convertRefs) @@ -46,23 +46,41 @@ map (map (toCslCite locMap)) grps) cits_map = tr' "cits_map" $ M.fromList $ zip grps (citations result) biblioList = map (renderPandoc' style) $ zip (bibliography result) (citationIds result) - Pandoc m b3 = bottomUp (mvPunct style) . deNote . + Pandoc m bs = bottomUp (mvPunct style) . deNote . topDown (processCite style cits_map) $ Pandoc m4 b2 - (bs, lastb) = case reverse b3 of - (Header lev (id',classes,kvs) ys) : xs -> - (reverse xs, [Header lev (id',classes',kvs) ys]) - where classes' = "unnumbered" : - [c | c <- classes, c /= "unnumbered"] - _ -> (b3, []) - refHeader = case refTitle m of - Just ils -> lastb ++ [Header 1 ("bibliography", ["unnumbered"], []) ils] - _ -> lastb - refDiv = case isRefRemove m of - True -> [] - False -> [Div ("",["references"],[]) (refHeader ++ biblioList)] in Pandoc m $ bottomUp (concatMap removeNocaseSpans) - $ bs ++ refDiv + $ insertRefs m biblioList bs +-- if document contains a Div with id="references", insert +-- references as its contents. Otherwise, insert references +-- at the end of the document in a Div with id="references" +insertRefs :: Meta -> [Block] -> [Block] -> [Block] +insertRefs meta refs bs = + if isRefRemove meta + then bs + else case runState (walkM go bs) False of + (bs', True) -> bs' + (_, False) -> + case reverse bs of + (Header lev (id',classes,kvs) ys) : xs -> + reverse xs ++ + [Div ("references",["references"],[]) + (Header lev (id',addUnNumbered classes,kvs) ys : + refs)] + _ -> bs ++ + [Div ("references",["references"],[]) + (refHeader ++ refs)] + where go :: Block -> State Bool Block + go (Div attr@("references",_,_) xs) = do + put True + return $ Div attr (refHeader ++ xs ++ refs) + go x = return x + addUnNumbered cs = "unnumbered" : [c | c <- cs, c /= "unnumbered"] + refHeader = case refTitle meta of + Just ils -> + [Header 1 ("bibliography", ["unnumbered"], []) ils] + _ -> [] + refTitle :: Meta -> Maybe [Inline] refTitle meta = case lookupMeta "reference-section-title" meta of @@ -81,8 +99,11 @@ isLinkCitations :: Meta -> Bool isLinkCitations meta = case lookupMeta "link-citations" meta of - Just (MetaBool True) -> True - _ -> False + Just (MetaBool True) -> True + Just (MetaString s) -> map toLower s `elem` yesValues + Just (MetaInlines ils) -> map toLower (stringify ils) `elem` yesValues + _ -> False + where yesValues = ["true", "yes", "on"] -- if the 'nocite' Meta field contains a citation with id = '*', -- create a cite with to all the references. diff --git a/src/Text/CSL/Reference.hs b/src/Text/CSL/Reference.hs --- a/src/Text/CSL/Reference.hs +++ b/src/Text/CSL/Reference.hs @@ -143,7 +143,7 @@ , "month" .= month refdate , "season" .= season refdate , "day" .= day refdate - , "other" .= other refdate ] ++ + , "literal" .= other refdate ] ++ [ "circa" .= circa refdate | circa refdate ] -} @@ -152,7 +152,7 @@ , "month" &= month r , "season" &= season r , "day" &= day r - , "other" &= other r + , "literal" &= other r , "circa" &= T.pack (if circa r then "1" else "") ] diff --git a/src/Text/CSL/Style.hs b/src/Text/CSL/Style.hs --- a/src/Text/CSL/Style.hs +++ b/src/Text/CSL/Style.hs @@ -781,7 +781,7 @@ v .:? "suffix" .!= mempty <*> v .:? "literal" .!= mempty <*> v .:? "comma-suffix" .!= False <*> - v .:? "parse-names" .!= True) + v .:? "parse-names" .!= False) parseJSON _ = fail "Could not parse Agent" instance ToYaml Agent where @@ -799,8 +799,8 @@ then "true" else "") , "parse-names" &= T.pack (if parseNames ag - then "" - else "false") + then "true" + else "") ] -- See http://gsl-nagoya-u.net/http/pub/citeproc-doc.html#id28 @@ -814,10 +814,15 @@ nonDroppingPartTransform :: Agent -> Agent nonDroppingPartTransform ag | nonDroppingPart ag == mempty = - case break startWithCapital' (unFormatted $ familyName ag) of + case break startWithCapital' + (splitStrWhen (\c -> isPunctuation c || isUpper c) $ + unFormatted $ familyName ag) of ([], _) -> ag - (xs, ys) -> ag { nonDroppingPart = Formatted $ trimSpace xs, + (xs, ys) + | lastInline xs `elem` [" ", "-", "'", "’"] -> ag { + nonDroppingPart = Formatted $ trimSpace xs, familyName = Formatted ys } + | otherwise -> ag | otherwise = ag trimSpace :: [Inline] -> [Inline] @@ -881,7 +886,7 @@ , "suffix" .= nameSuffix agent , "literal" .= literal agent ] ++ ["comma-suffix" .= commaSuffix agent | nameSuffix agent /= mempty] - ++ ["parse-names" .= False | not (parseNames agent) ] + ++ ["parse-names" .= True | parseNames agent ] instance FromJSON [Agent] where parseJSON (Array xs) = mapM parseJSON $ V.toList xs diff --git a/tests/chicago-author-date.expected.native b/tests/chicago-author-date.expected.native --- a/tests/chicago-author-date.expected.native +++ b/tests/chicago-author-date.expected.native @@ -14,4 +14,4 @@ ,Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 18}] [Str "(Doe",Space,Link [Str "2005"] ("#ref-item1",""),Space,Str "and",Space,Str "nowhere",Space,Str "else)"],Str "."] ,Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 19}] [Str "(",Link [Str "2005"] ("#ref-item1",""),Str ")"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 20}] [Str "(",Link [Str "2006"] ("#ref-item2",""),Str ",",Space,Str "44)"],Str "."]]] ,Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21}] [Str "(",Emph [Str "see"],Space,Str "Doe",Space,Link [Str "2005"] ("#ref-item1",""),Str ",",Space,Str "32)"],Str "."] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:",Space,Str "33\8211\&34."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Str "and",Space,Str "Jenny",Space,Str "Roe.",Space,Str "2007.",Space,Str "\8220Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet.\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith.",Space,Str "Oxford:",Space,Str "Oxford",Space,Str "University",Space,Str "Press."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "2005.",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge:",Space,Str "Cambridge",Space,Str "University",Space,Str "Press."]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "2006.",Space,Str "\8220Article.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6:",Space,Str "33\8211\&34."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe,",Space,Str "John,",Space,Str "and",Space,Str "Jenny",Space,Str "Roe.",Space,Str "2007.",Space,Str "\8220Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet.\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith.",Space,Str "Oxford:",Space,Str "Oxford",Space,Str "University",Space,Str "Press."]]]] diff --git a/tests/ieee.expected.native b/tests/ieee.expected.native --- a/tests/ieee.expected.native +++ b/tests/ieee.expected.native @@ -14,4 +14,4 @@ ,Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 18}] [Str "[",Link [Str "1"] ("#ref-item1",""),Str "]"],Str "."] ,Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 19}] [Str "[",Link [Str "1"] ("#ref-item1",""),Str "]"],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 20}] [Str "[",Link [Str "2"] ("#ref-item2",""),Str ",",Space,Str "p.",Space,Str "44",Str "]"],Str "."]]] ,Para [Str "With",Space,Str "some",Space,Str "markup",Space,Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21}] [Str "[",Link [Str "1"] ("#ref-item1",""),Str ",",Space,Str "p.",Space,Str "32",Str "]"],Str "."] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "[",Str "1",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Str ",",Space,Emph [Str "First",Space,Str "book"],Str ".",Space,Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2005",Str "."]],Div ("ref-item2",[],[]) [Para [Str "[",Str "2",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Str ",",Space,Str "\8220",Str "Article",Str ",",Str "\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Str ",",Space,Str "vol.",Space,Str "6",Str ",",Space,Str "pp.",Space,Str "33\8211\&34",Str ",",Space,Str "2006",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "[",Str "3",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Space,Str "and",Space,Str "J",Str ".",Space,Str "Roe",Str ",",Space,Str "\8220",Str "Why",Space,Str "water",Space,Str "is",Space,Str "wet",Str ",",Str "\8221",Space,Str "in",Space,Emph [Str "Third",Space,Str "book"],Str ",",Space,Str "S",Str ".",Space,Str "Smith",Str ",",Space,Str "Ed.",Space,Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2007",Str "."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "[",Str "1",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Str ",",Space,Emph [Str "First",Space,Str "book"],Str ".",Space,Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2005",Str "."]],Div ("ref-item2",[],[]) [Para [Str "[",Str "2",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Str ",",Space,Str "\8220",Str "Article",Str ",",Str "\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Str ",",Space,Str "vol.",Space,Str "6",Str ",",Space,Str "pp.",Space,Str "33\8211\&34",Str ",",Space,Str "2006",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "[",Str "3",Str "]",Space,Str "J",Str ".",Space,Str "Doe",Space,Str "and",Space,Str "J",Str ".",Space,Str "Roe",Str ",",Space,Str "\8220",Str "Why",Space,Str "water",Space,Str "is",Space,Str "wet",Str ",",Str "\8221",Space,Str "in",Space,Emph [Str "Third",Space,Str "book"],Str ",",Space,Str "S",Str ".",Space,Str "Smith",Str ",",Space,Str "Ed.",Space,Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2007",Str "."]]]] diff --git a/tests/issue118.expected.native b/tests/issue118.expected.native --- a/tests/issue118.expected.native +++ b/tests/issue118.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("director",MetaMap (fromList [("family",MetaInlines [Str "Hitchcock"]),("given",MetaInlines [Str "Alfred"])])),("id",MetaInlines [Str "nbn"]),("issued",MetaMap (fromList [("year",MetaString "1959")])),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "Metro-Goldwyn-Mayer"]),("publisher-place",MetaInlines [Str "USA"]),("title",MetaInlines [Str "North",Space,Str "by",Space,Str "Northwest"]),("type",MetaInlines [Str "motion_picture"])])])]}) [Para [Cite [Citation {citationId = "nbn", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "North",Space,Str "by",Space,Str "Northwest"],Space,Str "1959)"],Space,Str "is",Space,Str "a",Space,Str "spy",Space,Str "thriller",Space,Str "film."] -,Div ("",["references"],[]) [Div ("ref-nbn",[],[]) [Para [Emph [Str "North",Space,Str "by",Space,Str "Northwest"],Str ".",Space,Str "1959.",Space,Str "Directed",Space,Str "by",Space,Str "Alfred",Space,Str "Hitchcock.",Space,Str "USA:",Space,Str "Metro-Goldwyn-Mayer."]]]] +,Div ("references",["references"],[]) [Div ("ref-nbn",[],[]) [Para [Emph [Str "North",Space,Str "by",Space,Str "Northwest"],Str ".",Space,Str "1959.",Space,Str "Directed",Space,Str "by",Space,Str "Alfred",Space,Str "Hitchcock.",Space,Str "USA:",Space,Str "Metro-Goldwyn-Mayer."]]]] diff --git a/tests/issue13.expected.native b/tests/issue13.expected.native --- a/tests/issue13.expected.native +++ b/tests/issue13.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-note-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Ann"]])])),("container-title",MetaInlines [Str "Journal"]),("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "2011")])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "article-newspaper"])])])]}) [Para [Str "Foo",Str ".",Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "Author",Str ",",Space,Str "\8220",Str "Title",Str ".",Str "\8221",Space]]],Str ""] -,Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author",Str ",",Space,Str "Ann",Str ".",Space,Str "\8220",Str "Title",Str ".",Str "\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "2011",Str "."]]]] +,Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author",Str ",",Space,Str "Ann",Str ".",Space,Str "\8220",Str "Title",Str ".",Str "\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "2011",Str "."]]]] diff --git a/tests/issue14.expected.native b/tests/issue14.expected.native --- a/tests/issue14.expected.native +++ b/tests/issue14.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "chicago-author-date.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("container-title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("id",MetaInlines [Str "CTv1c2"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("page",MetaInlines [Str "34-56"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "Chapter",Space,Str "two"]),("type",MetaInlines [Str "chapter"]),("volume",MetaString "1"),("volume-title",MetaInlines [Str "The",Space,Str "emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "tradition",Space,Str "(100\8211\&600)"])]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("container-title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("id",MetaInlines [Str "CTv1"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "The",Space,Str "emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "tradition",Space,Str "(100\8211\&600)"]),("type",MetaInlines [Str "book"]),("volume",MetaString "1")]),MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Pelikan"]),("given",MetaInlines [Str "Jaroslav"])])),("id",MetaInlines [Str "CT"]),("issued",MetaList [MetaMap (fromList [("year",MetaString "1971")])]),("language",MetaInlines [Str "en-US"]),("publisher",MetaInlines [Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Chicago"]),("title",MetaInlines [Str "The",Space,Str "Christian",Space,Str "tradition:",Space,Str "A",Space,Str "history",Space,Str "of",Space,Str "the",Space,Str "development",Space,Str "of",Space,Str "doctrine"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "CT", citationPrefix = [], citationSuffix = [Str ",",Space,Str "1:12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Pelikan",Space,Str "1971b,",Space,Str "1:12)"],Str ".",Space,Str "Bar",Space,Cite [Citation {citationId = "CTv1", citationPrefix = [], citationSuffix = [Str ",",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Pelikan",Space,Str "1971c,",Space,Str "1:12)"],Str ".",Space,Str "Baz",Space,Cite [Citation {citationId = "CTv1c2", citationPrefix = [], citationSuffix = [Str ",",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Str "(Pelikan",Space,Str "1971a,",Space,Str "12)"],Str "."] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-CTv1c2",[],[]) [Para [Str "Pelikan,",Space,Str "Jaroslav.",Space,Str "1971a.",Space,Str "\8220Chapter",Space,Str "Two.\8221",Space,Str "In",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ",",Space,Str "1:34\8211\&56.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CT",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971b.",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CTv1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971c.",Space,Emph [Str "The",Space,Str "Emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "Tradition",Space,Str "(100\8211\&600)"],Str ".",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Vol.",Space,Str "1.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-CTv1c2",[],[]) [Para [Str "Pelikan,",Space,Str "Jaroslav.",Space,Str "1971a.",Space,Str "\8220Chapter",Space,Str "Two.\8221",Space,Str "In",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ",",Space,Str "1:34\8211\&56.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CT",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971b.",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]],Div ("ref-CTv1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1971c.",Space,Emph [Str "The",Space,Str "Emergence",Space,Str "of",Space,Str "the",Space,Str "Catholic",Space,Str "Tradition",Space,Str "(100\8211\&600)"],Str ".",Space,Emph [Str "The",Space,Str "Christian",Space,Str "Tradition:",Space,Str "A",Space,Str "History",Space,Str "of",Space,Str "the",Space,Str "Development",Space,Str "of",Space,Str "Doctrine"],Str ".",Space,Str "Vol.",Space,Str "1.",Space,Str "Chicago:",Space,Str "University",Space,Str "of",Space,Str "Chicago",Space,Str "Press."]]]] diff --git a/tests/issue25.expected.native b/tests/issue25.expected.native --- a/tests/issue25.expected.native +++ b/tests/issue25.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "bazbaz",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Str "Foo",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Author",Space,Str "1998)"],Str "."] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Foo.\8221"]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Foo.\8221"]]]] diff --git a/tests/issue27.expected.native b/tests/issue27.expected.native --- a/tests/issue27.expected.native +++ b/tests/issue27.expected.native @@ -1,4 +1,4 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/science.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "AuthorOne"]),("given",MetaInlines [Str "Joe"])]),MetaMap (fromList [("family",MetaInlines [Str "AuthorTwo"]),("given",MetaInlines [Str "Jill"])])]),("container-title",MetaInlines [Str "Some",Space,Str "Journal"]),("id",MetaInlines [Str "AuthorOne2014"]),("issue",MetaInlines [Str "X"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2014"]])])),("page",MetaInlines [Str "XXXX-YYYY"]),("title",MetaInlines [Str "Sample",Space,Str "Title"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaInlines [Str "XX"])])])]}) [Header 1 ("minimal-example",[],[]) [Str "Minimal",Space,Str "example"] ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "text",Space,Str "that",Space,Str "needs",Space,Str "a",Space,Str "citation",Space,Cite [Citation {citationId = "AuthorOne2014", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "1"],Str ")"],Str "."] -,Div ("",["references"],[]) [Div ("ref-AuthorOne2014",[],[]) [Para [Str "1.",Space,Str "J.",Space,Str "AuthorOne,",Space,Str "J.",Space,Str "AuthorTwo,",Space,Emph [Str "Some",Space,Str "Journal"],Str ",",Space,Str "in",Space,Str "press."]]]] +,Div ("references",["references"],[]) [Div ("ref-AuthorOne2014",[],[]) [Para [Str "1.",Space,Str "J.",Space,Str "AuthorOne,",Space,Str "J.",Space,Str "AuthorTwo,",Space,Emph [Str "Some",Space,Str "Journal"],Str ",",Space,Str "in",Space,Str "press."]]]] diff --git a/tests/issue51.expected.native b/tests/issue51.expected.native --- a/tests/issue51.expected.native +++ b/tests/issue51.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John"])])]),("container-title",MetaInlines [Str "Journal",Space,Str "of",Space,Str "Something"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1987"],MetaList [MetaString "1988"]])])),("page",MetaInlines [Str "12-34"]),("title",MetaInlines [Str "The",Space,Str "title"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "3")]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Roe"]),("given",MetaInlines [Str "Ron"])])]),("container-title",MetaInlines [Str "Journal",Space,Str "of",Space,Str "Something"]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1987"]])])),("page",MetaInlines [Str "12-34"]),("title",MetaInlines [Str "The",Space,Str "title"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaString "4")])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Doe",Space,Str "(1987\8211\&1988)"],Str ";",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Roe",Space,Str "(1987)"]] -,Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "1987\8211\&1988.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "3:",Space,Str "12\8211\&34."]],Div ("ref-item2",[],[]) [Para [Str "Roe,",Space,Str "Ron.",Space,Str "1987.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "4:",Space,Str "12\8211\&34."]]]] +,Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe,",Space,Str "John.",Space,Str "1987\8211\&1988.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "3:",Space,Str "12\8211\&34."]],Div ("ref-item2",[],[]) [Para [Str "Roe,",Space,Str "Ron.",Space,Str "1987.",Space,Str "\8220The",Space,Str "Title.\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Something"],Space,Str "4:",Space,Str "12\8211\&34."]]]] diff --git a/tests/issue57.expected.native b/tests/issue57.expected.native --- a/tests/issue57.expected.native +++ b/tests/issue57.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-author-date-with-original-date-and-status.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Faraday"]),("given",MetaInlines [Str "Carry"])])]),("container-title",MetaInlines [Str "Seven",Space,Str "Trips",Space,Str "beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"]),("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Oring"]),("given",MetaInlines [Str "James"])])]),("id",MetaInlines [Str "Faraday-forthcoming"]),("publisher",MetaInlines [Str "Launch",Space,Str "Press"]),("publisher-place",MetaInlines [Str "Cape",Space,Str "Canaveral,",Space,Str "FL"]),("status",MetaInlines [Str "forthcoming"]),("title",MetaInlines [Str "Protean",Space,Str "photography"]),("type",MetaInlines [Str "chapter"])])])]}) [Para [Cite [Citation {citationId = "Faraday-forthcoming", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Str "Faraday",Str ",",Space,Str "forthcoming",Str ")"]] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-Faraday-forthcoming",[],[]) [Para [Str "Faraday",Str ",",Space,Str "Carry",Str ".",Space,Str "Forthcoming",Str ".",Space,Str "\8220",Str "Protean",Space,Str "Photography",Str ".",Str "\8221",Space,Str "In",Space,Emph [Str "Seven",Space,Str "Trips",Space,Str "Beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "James",Space,Str "Oring",Str ".",Space,Str "Cape",Space,Str "Canaveral,",Space,Str "FL",Str ":",Space,Str "Launch",Space,Str "Press",Str "."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-Faraday-forthcoming",[],[]) [Para [Str "Faraday",Str ",",Space,Str "Carry",Str ".",Space,Str "Forthcoming",Str ".",Space,Str "\8220",Str "Protean",Space,Str "Photography",Str ".",Str "\8221",Space,Str "In",Space,Emph [Str "Seven",Space,Str "Trips",Space,Str "Beyond",Space,Str "the",Space,Str "Asteroid",Space,Str "Belt"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "James",Space,Str "Oring",Str ".",Space,Str "Cape",Space,Str "Canaveral,",Space,Str "FL",Str ":",Space,Str "Launch",Space,Str "Press",Str "."]]]] diff --git a/tests/issue58.expected.native b/tests/issue58.expected.native --- a/tests/issue58.expected.native +++ b/tests/issue58.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue58.csl"]),("references",MetaList [MetaMap (fromList [("id",MetaInlines [Str "stanze"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1547"]])])),("language",MetaInlines [Str "it-IT"]),("publisher-place",MetaInlines [Str "Florence"]),("title",MetaInlines [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "In",Space,Str "this",Space,Str "item,",Space,Str "the",Space,Str "title",Space,Str "replaces",Space,Str "the",Space,Str "(unknown)",Space,Str "author",Space,Str "(see",Space,Str "14.79)",Space,Cite [Citation {citationId = "stanze", citationPrefix = [], citationSuffix = [Str ",",Space,Str "p.",Space,Str "12"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Space,Str "1547,",Space,Str "12)"],Str "."] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-stanze",[],[]) [Para [Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Str ".",Space,Str "1547.",Space,Str "Florence."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-stanze",[],[]) [Para [Emph [Str "Stanze",Space,Str "in",Space,Str "lode",Space,Str "della",Space,Str "donna",Space,Str "brutta"],Str ".",Space,Str "1547.",Space,Str "Florence."]]]] diff --git a/tests/issue61.expected.native b/tests/issue61.expected.native --- a/tests/issue61.expected.native +++ b/tests/issue61.expected.native @@ -5,4 +5,4 @@ ,Para [Str "Foo",Str "",Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [Str ",",Space,Str "LVIII,",Space,Str "89"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Note [Para [Str "Doe",Str ",",Space,Str "LVIII,",Space,Str "89",Str ".",Space]]]] ,Para [Str "Foo",Str "",Cite [Citation {citationId = "roe", citationPrefix = [], citationSuffix = [Str ",",Space,Str "MVIII,",Space,Str "89"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4}] [Note [Para [Str "Roe",Str ",",Space,Str "MVIII,",Space,Str "89",Str ".",Space]]]] ,Para [Str "Foo",Str "",Cite [Citation {citationId = "doe", citationPrefix = [], citationSuffix = [Str ",",Space,Str "CL,",Space,Str "89"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5}] [Note [Para [Str "Doe",Str ",",Space,Str "CL,",Space,Str "89",Str ".",Space]]]] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-doe",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Emph [Str "Title"],Space,Str "(",Str "Publisher",Str ",",Space,Str "1985",Str ")"]],Div ("ref-roe",[],[]) [Para [Str "Roe",Str ",",Space,Str "Rob",Str ",",Space,Emph [Str "Title"],Space,Str "(",Str "Publisher",Str ",",Space,Str "1985",Str ")"]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-doe",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Emph [Str "Title"],Space,Str "(",Str "Publisher",Str ",",Space,Str "1985",Str ")"]],Div ("ref-roe",[],[]) [Para [Str "Roe",Str ",",Space,Str "Rob",Str ",",Space,Emph [Str "Title"],Space,Str "(",Str "Publisher",Str ",",Space,Str "1985",Str ")"]]]] diff --git a/tests/issue64.expected.native b/tests/issue64.expected.native --- a/tests/issue64.expected.native +++ b/tests/issue64.expected.native @@ -1,2 +1,2 @@ Pandoc (Meta {unMeta = fromList [("bibliography",MetaList [MetaInlines [Str "tests/biblio.bib"]]),("nocite",MetaInlines [Cite [Citation {citationId = "*", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(",Span ("",["citeproc-not-found"],[("data-reference-id","*")]) [Strong [Str "???"]],Str ")"]])]}) -[Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ".",Space,Str "2005",Str ".",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str "."]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212",Str ".",Space,Str "2006",Str ".",Space,Str "\8220",Str "Article",Str ".",Str "\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6",Str ":",Space,Str "33\8211\&34",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "and",Space,Str "Jenny",Space,Str "Roe",Str ".",Space,Str "2007",Str ".",Space,Str "\8220",Str "Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet",Str ".",Str "\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith",Str ".",Space,Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str "."]]]] +[Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ".",Space,Str "2005",Str ".",Space,Emph [Str "First",Space,Str "Book"],Str ".",Space,Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str "."]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212",Str ".",Space,Str "2006",Str ".",Space,Str "\8220",Str "Article",Str ".",Str "\8221",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Space,Str "6",Str ":",Space,Str "33\8211\&34",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "and",Space,Str "Jenny",Space,Str "Roe",Str ".",Space,Str "2007",Str ".",Space,Str "\8220",Str "Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet",Str ".",Str "\8221",Space,Str "In",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Sam",Space,Str "Smith",Str ".",Space,Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str "."]]]] diff --git a/tests/issue65.expected.native b/tests/issue65.expected.native --- a/tests/issue65.expected.native +++ b/tests/issue65.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "3406493556"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Stotz"]),("given",MetaInlines [Str "Peter"])])]),("call-number",MetaInlines [Str "PA25",Space,Str "PA2616",Space,Str ".H24",Space,Str "Abt.",Space,Str "2,",Space,Str "T.",Space,Str "5,",Space,Str "Bd.",Space,Str "2,",Space,Str "etc"]),("collection-number",MetaInlines [Str "2.5"]),("collection-title",MetaInlines [Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft"]),("event-place",MetaInlines [Str "Munich"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "stotz:1996handbuch"]),("issued",MetaMap (fromList [("literal",MetaInlines [Str "1996_2004"])])),("language",MetaInlines [Str "German"]),("number-of-volumes",MetaInlines [Str "5"]),("publisher",MetaInlines [Str "Beck"]),("publisher-place",MetaInlines [Str "Munich"]),("source",MetaInlines [Str "Library",Space,Str "of",Space,Str "Congress",Space,Str "ISBN"]),("title",MetaInlines [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"]),("title-short",MetaInlines [Str "Handbuch"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "stotz:1996handbuch", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Stotz",Space,Str "1996\8211\&2004)"]] -,Div ("",["references"],[]) [Div ("ref-stotz:1996handbuch",[],[]) [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft,",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]] +,Div ("references",["references"],[]) [Div ("ref-stotz:1996handbuch",[],[]) [Para [Str "Stotz,",Space,Str "Peter.",Space,Str "1996\8211\&2004.",Space,Emph [Str "Handbuch",Space,Str "zur",Space,Str "lateinischen",Space,Str "Sprache",Space,Str "des",Space,Str "Mittelalters"],Str ".",Space,Str "5",Space,Str "vols.",Space,Str "Handbuch",Space,Str "der",Space,Str "Altertumswissenschaft,",Space,Str "2.5.",Space,Str "Munich:",Space,Str "Beck."]]]] diff --git a/tests/issue68.expected.native b/tests/issue68.expected.native --- a/tests/issue68.expected.native +++ b/tests/issue68.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "0888441088"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Goering"]),("given",MetaInlines [Str "Joseph"])])]),("call-number",MetaInlines [Str "BV4009",Space,Str ".W55",Space,Str "1992"]),("collection-number",MetaInlines [Str "108"]),("collection-title",MetaInlines [Str "Studies",Space,Str "and",Space,Str "Texts"]),("event-place",MetaInlines [Str "Toronto"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "goering:1992william"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1992"]])])),("publisher",MetaInlines [Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies"]),("publisher-place",MetaInlines [Str "Toronto"]),("source",MetaInlines [Str "toroprod.library.utoronto.ca",Space,Str "Library",Space,Str "Catalog"]),("title",MetaInlines [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(c.",Space,Str "1140\8211\&1213):",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"]),("title-short",MetaInlines [Str "William",Space,Str "de",Space,Str "Montibus"]),("type",MetaInlines [Str "book"])])])]}) [Para [Str "...",Space,Str "a",Space,Str "prose",Space,Str "commentary",Str ".",Cite [Citation {citationId = "goering:1992william", citationPrefix = [Str "the",Space,Str "text",Space,Str "of",Space,Str "fol.",Space,Str "9r",Space,Str "is",Space,Str "printed",Space,Str "in"], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "501\8211\&3"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "The",Space,Str "text",Space,Str "of",Space,Str "fol.",Space,Str "9r",Space,Str "is",Space,Str "printed",Space,Str "in",Space,Str "Joseph",Space,Str "Goering",Str ",",Space,Emph [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(",Str "c",Str ".",Space,Str "1140",Str "\8211",Str "1213",Str ")",Str ":",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"],Str ",",Space,Str "Studies",Space,Str "and",Space,Str "Texts",Space,Str "108",Space,Str "(",Str "Toronto",Str ":",Space,Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies",Str ",",Space,Str "1992",Str ")",Str ",",Space,Str "501\8211\&3",Str ".",Space]]],Str "",Space,Str "...",Space,Str "a",Space,Str "collection",Space,Str "of",Space,Str "verses",Space,Str "with",Space,Str "a",Space,Str "formal",Space,Str "prose",Space,Str "commentary",Cite [Citation {citationId = "goering:1992william", citationPrefix = [Str "excerpts",Space,Str "from",Space,Str "this",Space,Str "text",Space,Str "were",Space,Str "previously",Space,Str "printed",Space,Str "in"], citationSuffix = [Str ",",Space,Str "p.",Space,Str "508\8211\&14"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "goering:1992william", citationPrefix = [Str "it",Space,Str "was",Space,Str "also",Space,Str "briefly",Space,Str "described",Space,Str "in"], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "141\8211\&42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Note [Para [Str "Excerpts",Space,Str "from",Space,Str "this",Space,Str "text",Space,Str "were",Space,Str "previously",Space,Str "printed",Space,Str "in",Space,Str "ibid.",Str ",",Space,Str "508\8211\&14",Str ";",Space,Str "it",Space,Str "was",Space,Str "also",Space,Str "briefly",Space,Str "described",Space,Str "in",Space,Str "ibid.",Str ",",Space,Str "141\8211\&42",Str ".",Space]]],Space,Str "...",Space,Str "and",Space,Str "finally",Space,Str "a",Space,Str "note",Space,Str "starting",Space,Str "with",Space,Str "a",Space,Str "citation",Str ".",Cite [Citation {citationId = "goering:1992william", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.",Space,Str "141-42"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4}] [Note [Para [Str "Ibid.",Str ",",Space,Str "141\8211\&42",Str ".",Space]]],Str ""] -,Div ("",["references"],[]) [Div ("ref-goering:1992william",[],[]) [Para [Str "Goering",Str ",",Space,Str "Joseph",Str ".",Space,Emph [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(",Str "c",Str ".",Space,Str "1140",Str "\8211",Str "1213",Str ")",Str ":",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"],Str ".",Space,Str "Studies",Space,Str "and",Space,Str "Texts",Space,Str "108",Str ".",Space,Str "Toronto",Str ":",Space,Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies",Str ",",Space,Str "1992",Str "."]]]] +,Div ("references",["references"],[]) [Div ("ref-goering:1992william",[],[]) [Para [Str "Goering",Str ",",Space,Str "Joseph",Str ".",Space,Emph [Str "William",Space,Str "de",Space,Str "Montibus",Space,Str "(",Str "c",Str ".",Space,Str "1140",Str "\8211",Str "1213",Str ")",Str ":",Space,Str "The",Space,Str "Schools",Space,Str "and",Space,Str "the",Space,Str "Literature",Space,Str "of",Space,Str "Pastoral",Space,Str "Care"],Str ".",Space,Str "Studies",Space,Str "and",Space,Str "Texts",Space,Str "108",Str ".",Space,Str "Toronto",Str ":",Space,Str "Pontifical",Space,Str "Institute",Space,Str "of",Space,Str "Mediaeval",Space,Str "Studies",Str ",",Space,Str "1992",Str "."]]]] diff --git a/tests/issue7.expected.native b/tests/issue7.expected.native --- a/tests/issue7.expected.native +++ b/tests/issue7.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Ann"]])])),("container-title",MetaInlines [Str "Journal"]),("id",MetaInlines [Str "item1"]),("issued",MetaList [MetaMap (fromList [("day",MetaString "24"),("month",MetaString "9"),("year",MetaString "2011")]),MetaMap (fromList [("day",MetaString "26"),("month",MetaString "9"),("year",MetaString "2011")])]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "article-magazine"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(2011)"]] -,Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Ann.",Space,Str "2011.",Space,Str "\8220Title.\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "September",Space,Str "24\8211\&26."]]]] +,Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Ann.",Space,Str "2011.",Space,Str "\8220Title.\8221",Space,Emph [Str "Journal"],Str ",",Space,Str "September",Space,Str "24\8211\&26."]]]] diff --git a/tests/issue70.expected.native b/tests/issue70.expected.native --- a/tests/issue70.expected.native +++ b/tests/issue70.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("ISBN",MetaInlines [Str "9782503531465"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dinkova-Bruun"]),("given",MetaInlines [Str "Greti"])])]),("call-number",MetaInlines [Str "CB351",Space,Str ".F564",Space,Str "2009"]),("collection-number",MetaInlines [Str "50"]),("collection-title",MetaInlines [Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge"]),("container-title",MetaInlines [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"]),("editor",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Meirinhos"]),("given",MetaInlines [Str "Jos\233",Space,Str "Francisco"])]),MetaMap (fromList [("family",MetaInlines [Str "Weijers"]),("given",MetaInlines [Str "Olga"])])]),("event-place",MetaInlines [Str "Louvain-la-Neuve"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "bruun:2009samuel"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2009"]])])),("language",MetaInlines [Str "French"]),("page",MetaInlines [Str "155\8211\&174"]),("publisher",MetaInlines [Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales"]),("publisher-place",MetaInlines [Str "Louvain-la-Neuve"]),("source",MetaInlines [Str "Library",Space,Str "of",Space,Str "Congress",Space,Str "ISBN"]),("title",MetaInlines [Str "Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?"]),("title-short",MetaInlines [Str "Samuel",Space,Str "Presbyter"]),("type",MetaInlines [Str "chapter"])]),MetaMap (fromList [("ISSN",MetaInlines [Str "0362-1529"]),("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Thorndike"]),("given",MetaInlines [Str "Lynn"])])]),("container-title",MetaInlines [Str "Traditio"]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "thorndike:1955unde"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1955"]])])),("language",MetaInlines [Str "Latin"]),("note",MetaInlines [Str "ArticleType:",Space,Str "research-article",Space,Str "/",Space,Str "Full",Space,Str "publication",Space,Str "date:",Space,Str "1955",Space,Str "/",Space,Str "Copyright",Space,Str "\169",Space,Str "1955",Space,Str "Fordham",Space,Str "University"]),("page",MetaInlines [Str "163\8211\&193"]),("source",MetaInlines [Str "JSTOR"]),("title",MetaInlines [Str "Unde",Space,Str "versus"]),("type",MetaInlines [Str "article-journal"]),("volume",MetaInlines [Str "11"])])])]}) [Para [Cite [Citation {citationId = "thorndike:1955unde", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "bruun:2009samuel", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Thorndike",Space,Str "1955;",Space,Str "Dinkova-Bruun",Space,Str "2009)"]] -,Div ("",["references"],[]) [Div ("ref-bruun:2009samuel",[],[]) [Para [Str "Dinkova-Bruun,",Space,Str "Greti.",Space,Str "2009.",Space,Str "\8220Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?\8221",Space,Str "In",Space,Emph [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Jos\233",Space,Str "Francisco",Space,Str "Meirinhos",Space,Str "and",Space,Str "Olga",Space,Str "Weijers,",Space,Str "155\8211\&74.",Space,Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge",Space,Str "50.",Space,Str "Louvain-la-Neuve:",Space,Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales."]],Div ("ref-thorndike:1955unde",[],[]) [Para [Str "Thorndike,",Space,Str "Lynn.",Space,Str "1955.",Space,Str "\8220Unde",Space,Str "versus.\8221",Space,Emph [Str "Traditio"],Space,Str "11:",Space,Str "163\8211\&93."]]]] +,Div ("references",["references"],[]) [Div ("ref-bruun:2009samuel",[],[]) [Para [Str "Dinkova-Bruun,",Space,Str "Greti.",Space,Str "2009.",Space,Str "\8220Samuel",Space,Str "Presbyter",Space,Str "and",Space,Str "the",Space,Str "Glosses",Space,Str "to",Space,Str "His",Space,Str "Versification",Space,Str "of",Space,Str "Psalm",Space,Str "1:",Space,Str "An",Space,Str "Anti-Church",Space,Str "Invective?\8221",Space,Str "In",Space,Emph [Str "Florilegium",Space,Str "mediaevale:",Space,Str "\201tudes",Space,Str "offertes",Space,Str "\224",Space,Str "Jacqueline",Space,Str "Hamesse",Space,Str "\224",Space,Str "l\8217occasion",Space,Str "de",Space,Str "son",Space,Str "\233m\233ritat"],Str ",",Space,Str "edited",Space,Str "by",Space,Str "Jos\233",Space,Str "Francisco",Space,Str "Meirinhos",Space,Str "and",Space,Str "Olga",Space,Str "Weijers,",Space,Str "155\8211\&74.",Space,Str "Textes",Space,Str "et",Space,Str "\233tudes",Space,Str "du",Space,Str "moyen",Space,Str "\226ge",Space,Str "50.",Space,Str "Louvain-la-Neuve:",Space,Str "F\233d\233ration",Space,Str "Internationale",Space,Str "des",Space,Str "Instituts",Space,Str "d\8217\201tudes",Space,Str "M\233di\233vales."]],Div ("ref-thorndike:1955unde",[],[]) [Para [Str "Thorndike,",Space,Str "Lynn.",Space,Str "1955.",Space,Str "\8220Unde",Space,Str "versus.\8221",Space,Emph [Str "Traditio"],Space,Str "11:",Space,Str "163\8211\&93."]]]] diff --git a/tests/issue75.expected.native b/tests/issue75.expected.native --- a/tests/issue75.expected.native +++ b/tests/issue75.expected.native @@ -10,4 +10,4 @@ ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Space,Str "bk.",Space,Str "VI"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 9}] [Str "(Doe,",Space,Str "2006,",Space,Str "bk.",Space,Str "VI)"]] ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Str ",",Space,Str "no.",Space,Str "6"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 10}] [Str "(Doe,",Space,Str "2006,",Space,Str "no.",Space,Str "6)"]] ,Para [Cite [Citation {citationId = "test", citationPrefix = [], citationSuffix = [Str ",",Space,Str "nos.",Space,Str "6",Space,Str "and",Space,Str "7"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 11}] [Str "(Doe,",Space,Str "2006,",Space,Str "nos.",Space,Str "6",Space,Str "and",Space,Str "7)"]] -,Div ("",["references"],[]) [Div ("ref-test",[],[]) [Para [Str "Doe,",Space,Str "J.",Space,Str "(2006).",Space,Str "Test,",Space,Emph [Str "81"],Str "."]]]] +,Div ("references",["references"],[]) [Div ("ref-test",[],[]) [Para [Str "Doe,",Space,Str "J.",Space,Str "(2006).",Space,Str "Test,",Space,Emph [Str "81"],Str "."]]]] diff --git a/tests/issue76.expected.native b/tests/issue76.expected.native --- a/tests/issue76.expected.native +++ b/tests/issue76.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "the",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item3"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "a",Space,Str "bazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaInlines [Str "Al"])])]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1998"]])])),("title",MetaInlines [Str "foo",Space,Str "bar",Space,Str "baz:",Space,Str "an",Space,Str "abazbaz",Space,Str "bar",Space,Str "foo"]),("type",MetaInlines [Str "article-journal"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(1998c)"],Str ",",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Author",Space,Str "(1998d)"],Str ",",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "Author",Space,Str "(1998a)"],Str ",",Space,Cite [Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 4}] [Str "Author",Space,Str "(1998b)"]] -,Div ("",["references"],[]) [Div ("ref-item3",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998a.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "A",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item4",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998b.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "An",Space,Str "Abazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998c.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998d.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "The",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]]]] +,Div ("references",["references"],[]) [Div ("ref-item3",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "1998a.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "A",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item4",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998b.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "An",Space,Str "Abazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item1",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998c.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]],Div ("ref-item2",[],[]) [Para [Str "\8212\8212\8212.",Space,Str "1998d.",Space,Str "\8220Foo",Space,Str "Bar",Space,Str "Baz:",Space,Str "The",Space,Str "Bazbaz",Space,Str "Bar",Space,Str "Foo.\8221"]]]] diff --git a/tests/issue77.expected.native b/tests/issue77.expected.native --- a/tests/issue77.expected.native +++ b/tests/issue77.expected.native @@ -1,3 +1,3 @@ -Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John,",Space,Str "III"])])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "van",Space,Str "Gogh"]),("given",MetaInlines [Str "Vincent"])])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Humboldt"]),("given",MetaInlines [Str "Alexander",Space,Str "von"])])]),("id",MetaInlines [Str "item3"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bennett"]),("given",MetaInlines [Str "Frank",Space,Str "G.,!",Space,Str "Jr."]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item4"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dumboldt"]),("given",MetaInlines [Str "Ezekiel,",Space,Str "III"]),("parse-names",MetaBool False)])]),("id",MetaInlines [Str "item5"]),("type",MetaInlines [Str "book"])])])]}) -[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3},Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4},Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5}] [Note [Para [Str "John",Space,Str "Doe",Space,Str "III",Str ",",Space,Str "n.d.",Str ";",Space,Str "Vincent",Space,Str "van",Space,Str "Gogh",Str ",",Space,Str "n.d.",Str ";",Space,Str "Alexander",Space,Str "von",Space,Str "Humboldt",Str ",",Space,Str "n.d.",Str ";",Space,Str "Frank",Space,Str "G",Str ".",Space,Str "Bennett",Str ",",Space,Str "Jr.",Str ",",Space,Str "n.d.",Str ";",Space,Str "Ezekiel,",Space,Str "III",Space,Str "Dumboldt",Str ",",Space,Str "n.d.",Space]]]] -,Div ("",["references"],[]) [Div ("ref-item4",[],[]) [Para [Str "Bennett",Str ",",Space,Str "Frank",Space,Str "G",Str ".",Str ",",Space,Str "Jr.",Str ",",Space,Str "n.d."]],Div ("ref-item1",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "III",Str ",",Space,Str "n.d."]],Div ("ref-item5",[],[]) [Para [Str "Dumboldt",Str ",",Space,Str "Ezekiel,",Space,Str "III",Str ",",Space,Str "n.d."]],Div ("ref-item3",[],[]) [Para [Str "Humboldt",Str ",",Space,Str "Alexander",Space,Str "von",Str ",",Space,Str "n.d."]],Div ("ref-item2",[],[]) [Para [Str "van",Space,Str "Gogh",Str ",",Space,Str "Vincent",Str ",",Space,Str "n.d."]]]] +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "van",Space,Str "Gogh"]),("given",MetaInlines [Str "Vincent"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Humboldt"]),("given",MetaInlines [Str "Alexander",Space,Str "von"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item3"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bennett"]),("given",MetaInlines [Str "Frank",Space,Str "G.,!",Space,Str "Jr."]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item4"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dumboldt"]),("given",MetaInlines [Str "Ezekiel,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item5"]),("type",MetaInlines [Str "book"])])])]}) +[Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2},Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3},Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 4},Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 5}] [Note [Para [Str "John",Space,Str "Doe",Space,Str "III",Str ",",Space,Str "n.d.",Str ";",Space,Str "Vincent",Space,Str "van",Space,Str "G",Str "ogh",Str ",",Space,Str "n.d.",Str ";",Space,Str "Alexander",Space,Str "von",Space,Str "Humboldt",Str ",",Space,Str "n.d.",Str ";",Space,Str "Frank",Space,Str "G",Str ".",Space,Str "Bennett",Str ",",Space,Str "Jr.",Str ",",Space,Str "n.d.",Str ";",Space,Str "Ezekiel",Space,Str "Dumboldt",Space,Str "III",Str ",",Space,Str "n.d.",Space]]]] +,Div ("references",["references"],[]) [Div ("ref-item4",[],[]) [Para [Str "Bennett",Str ",",Space,Str "Frank",Space,Str "G",Str ".",Str ",",Space,Str "Jr.",Str ",",Space,Str "n.d."]],Div ("ref-item1",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "III",Str ",",Space,Str "n.d."]],Div ("ref-item5",[],[]) [Para [Str "Dumboldt",Str ",",Space,Str "Ezekiel",Str ",",Space,Str "III",Str ",",Space,Str "n.d."]],Div ("ref-item3",[],[]) [Para [Str "Humboldt",Str ",",Space,Str "Alexander",Space,Str "von",Str ",",Space,Str "n.d."]],Div ("ref-item2",[],[]) [Para [Str "van",Space,Str "G",Str "ogh",Str ",",Space,Str "Vincent",Str ",",Space,Str "n.d."]]]] diff --git a/tests/issue77.in.native b/tests/issue77.in.native --- a/tests/issue77.in.native +++ b/tests/issue77.in.native @@ -1,2 +1,2 @@ -Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John,",Space,Str "III"])])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "van",Space,Str "Gogh"]),("given",MetaInlines [Str "Vincent"])])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Humboldt"]),("given",MetaInlines [Str "Alexander",Space,Str "von"])])]),("id",MetaInlines [Str "item3"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bennett"]),("given",MetaInlines [Str "Frank",Space,Str "G.,!",Space,Str "Jr."]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item4"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dumboldt"]),("given",MetaInlines [Str "Ezekiel,",Space,Str "III"]),("parse-names",MetaBool False)])]),("id",MetaInlines [Str "item5"]),("type",MetaInlines [Str "book"])])])]}) +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "John,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item1"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "van",Space,Str "Gogh"]),("given",MetaInlines [Str "Vincent"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item2"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Humboldt"]),("given",MetaInlines [Str "Alexander",Space,Str "von"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item3"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bennett"]),("given",MetaInlines [Str "Frank",Space,Str "G.,!",Space,Str "Jr."]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item4"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Dumboldt"]),("given",MetaInlines [Str "Ezekiel,",Space,Str "III"]),("parse-names",MetaBool True)])]),("id",MetaInlines [Str "item5"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1;",Space,Str "@item2;",Space,Str "@item3;",Space,Str "@item4;",Space,Str "@item5]"]]] diff --git a/tests/issue82.expected.native b/tests/issue82.expected.native --- a/tests/issue82.expected.native +++ b/tests/issue82.expected.native @@ -1,4 +1,4 @@ Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-annotated-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "https://www.worldcat.org/"]),("accessed",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "2014",MetaString "9",MetaString "19"]])])),("author",MetaList [MetaMap (fromList [("literal",MetaInlines [Str "OCLC"])])]),("first-reference-note-number",MetaString "1"),("id",MetaInlines [Str "OCLC_i1099"]),("title",MetaInlines [Str "WorldCat"]),("type",MetaInlines [Str "webpage"])])])]}) [Header 1 ("title",[],[]) [Str "Title"] ,Para [Str "Some",Space,Str "text.",Note [Para [Str "Comment",Space,Str "regarding",Space,Str "text,",Space,Str "supported",Space,Str "by",Space,Str "citation",Space,Cite [Citation {citationId = "OCLC_i1099", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "OCLC",Str ",",Space,Str "\8220",Str "WorldCat",Str ".",Str "\8221"]]]] -,Div ("",["references"],[]) [Div ("ref-OCLC_i1099",[],[]) [Para [Str "OCLC",Str ".",Space,Str "\8220",Str "WorldCat",Str ".",Str "\8221",Space,Str "Accessed",Space,Str "September",Space,Str "19",Str ",",Space,Str "2014",Str ".",Space,Link [Str "https://www.worldcat.org/"] ("https://www.worldcat.org/",""),Str "."]]]] +,Div ("references",["references"],[]) [Div ("ref-OCLC_i1099",[],[]) [Para [Str "OCLC",Str ".",Space,Str "\8220",Str "WorldCat",Str ".",Str "\8221",Space,Str "Accessed",Space,Str "September",Space,Str "19",Str ",",Space,Str "2014",Str ".",Space,Link [Str "https://www.worldcat.org/"] ("https://www.worldcat.org/",""),Str "."]]]] diff --git a/tests/mhra.expected.native b/tests/mhra.expected.native --- a/tests/mhra.expected.native +++ b/tests/mhra.expected.native @@ -14,4 +14,4 @@ ,Para [Str "Citation",Space,Str "with",Space,Str "suffix",Space,Str "only",Str ".",Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Space,Str "and",Space,Str "nowhere",Space,Str "else"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 18}] [Note [Para [Str "Doe",Str ",",Space,Emph [Str "First",Space,Str "Book"],Space,Str "and",Space,Str "nowhere",Space,Str "else",Str ".",Space]]],Str ""] ,Para [Str "Now",Space,Str "some",Space,Str "modifiers.",Note [Para [Str "Like",Space,Str "a",Space,Str "citation",Space,Str "without",Space,Str "author:",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 19}] [Emph [Str "First",Space,Str "Book"],Str ""],Str ",",Space,Str "and",Space,Str "now",Space,Str "Doe",Space,Str "with",Space,Str "a",Space,Str "locator",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [Space,Str "p.",Space,Str "44"], citationMode = SuppressAuthor, citationNoteNum = 0, citationHash = 20}] [Str "\8216",Str "Article",Str "\8217",Str ",",Space,Str "33\8211\&34",Space,Str "(",Str "p.",Space,Str "44",Str ")",Str ""],Str "."]]] ,Para [Str "With",Space,Str "some",Space,Str "markup",Str ".",Cite [Citation {citationId = "item1", citationPrefix = [Emph [Str "see"]], citationSuffix = [Space,Str "p.",Space,Strong [Str "32"]], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 21}] [Note [Para [Emph [Str "See"],Space,Str "Doe",Str ",",Space,Emph [Str "First",Space,Str "Book"],Str ",",Space,Str "p.",Space,Str "32",Str ".",Space]]],Str ""] -,Div ("",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item2",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "\8216",Str "Article",Str "\8217",Str ",",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Str ",",Space,Str "6",Space,Str "(",Str "2006",Str ")",Str ",",Space,Str "33\8211\&34",Str "."]],Div ("ref-item1",[],[]) [Para [Str "---",Str ",",Space,Emph [Str "First",Space,Str "Book"],Space,Str "(",Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2005",Str ")",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "and",Space,Str "Jenny",Space,Str "Roe",Str ",",Space,Str "\8216",Str "Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet",Str "\8217",Str ",",Space,Str "in",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "ed.",Space,Str "by",Space,Str "Sam",Space,Str "Smith",Space,Str "(",Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2007",Str ")",Str "."]]]] +,Div ("references",["references"],[]) [Header 1 ("references",["unnumbered"],[]) [Str "References"],Div ("ref-item2",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "\8216",Str "Article",Str "\8217",Str ",",Space,Emph [Str "Journal",Space,Str "of",Space,Str "Generic",Space,Str "Studies"],Str ",",Space,Str "6",Space,Str "(",Str "2006",Str ")",Str ",",Space,Str "33\8211\&34",Str "."]],Div ("ref-item1",[],[]) [Para [Str "---",Str ",",Space,Emph [Str "First",Space,Str "Book"],Space,Str "(",Str "Cambridge",Str ":",Space,Str "Cambridge",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2005",Str ")",Str "."]],Div ("ref-\1087\1091\1085\1082\1090\&3",[],[]) [Para [Str "Doe",Str ",",Space,Str "John",Str ",",Space,Str "and",Space,Str "Jenny",Space,Str "Roe",Str ",",Space,Str "\8216",Str "Why",Space,Str "Water",Space,Str "Is",Space,Str "Wet",Str "\8217",Str ",",Space,Str "in",Space,Emph [Str "Third",Space,Str "Book"],Str ",",Space,Str "ed.",Space,Str "by",Space,Str "Sam",Space,Str "Smith",Space,Str "(",Str "Oxford",Str ":",Space,Str "Oxford",Space,Str "University",Space,Str "Press",Str ",",Space,Str "2007",Str ")",Str "."]]]] diff --git a/tests/no-author.expected.native b/tests/no-author.expected.native --- a/tests/no-author.expected.native +++ b/tests/no-author.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "A"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item2"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "B"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item3"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "C"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "D"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item5"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "E"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Magazine"]),("id",MetaInlines [Str "item4"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "D"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Newspaper"]),("id",MetaInlines [Str "item5"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "E"]),("type",MetaInlines [Str "article-magazine"])]),MetaMap (fromList [("container-title",MetaInlines [Str "Newspaper"]),("id",MetaInlines [Str "item6"]),("issued",MetaMap (fromList [("year",MetaString "2012")])),("title",MetaInlines [Str "Title",Space,Str "F"]),("type",MetaInlines [Str "article-magazine"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [Str "p.",Space,Str "3"], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "(",Emph [Str "Magazine"],Space,Str "2012a,",Space,Str "3)"],Str ",",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "(",Emph [Str "Magazine"],Space,Str "2012b)"],Str ",",Space,Cite [Citation {citationId = "item3", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 3}] [Str "(",Emph [Str "Magazine"],Space,Str "2012c)"],Str ",",Space,Cite [Citation {citationId = "item4", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 4}] [Str "(",Emph [Str "Magazine"],Space,Str "2012d)"],Str ",",Space,Cite [Citation {citationId = "item5", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 5}] [Str "(",Emph [Str "Magazine"],Space,Str "2012e)"],Str ",",Space,Cite [Citation {citationId = "item6", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 6}] [Str "(",Emph [Str "Newspaper"],Space,Str "2012)"]] -,Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012a.",Space,Str "\8220Title",Space,Str "A.\8221"]],Div ("ref-item2",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012b.",Space,Str "\8220Title",Space,Str "B.\8221"]],Div ("ref-item3",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012c.",Space,Str "\8220Title",Space,Str "C.\8221"]],Div ("ref-item4",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012d.",Space,Str "\8220Title",Space,Str "D.\8221"]],Div ("ref-item5",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012e.",Space,Str "\8220Title",Space,Str "E.\8221"]],Div ("ref-item6",[],[]) [Para [Emph [Str "Newspaper"],Str ".",Space,Str "2012.",Space,Str "\8220Title",Space,Str "F.\8221"]]]] +,Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012a.",Space,Str "\8220Title",Space,Str "A.\8221"]],Div ("ref-item2",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012b.",Space,Str "\8220Title",Space,Str "B.\8221"]],Div ("ref-item3",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012c.",Space,Str "\8220Title",Space,Str "C.\8221"]],Div ("ref-item4",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012d.",Space,Str "\8220Title",Space,Str "D.\8221"]],Div ("ref-item5",[],[]) [Para [Emph [Str "Magazine"],Str ".",Space,Str "2012e.",Space,Str "\8220Title",Space,Str "E.\8221"]],Div ("ref-item6",[],[]) [Para [Emph [Str "Newspaper"],Str ".",Space,Str "2012.",Space,Str "\8220Title",Space,Str "F.\8221"]]]] diff --git a/tests/number-of-volumes.expected.native b/tests/number-of-volumes.expected.native --- a/tests/number-of-volumes.expected.native +++ b/tests/number-of-volumes.expected.native @@ -1,3 +1,3 @@ Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaMap (fromList [("family",MetaInlines [Str "Author"]),("given",MetaList [MetaInlines [Str "Al"]])])),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2013")])),("language",MetaInlines [Str "en-US"]),("number-of-volumes",MetaString "2"),("publisher",MetaInlines [Str "Publisher"]),("publisher-place",MetaInlines [Str "Location"]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "book"])])])]}) [Para [Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Author",Space,Str "(2013)"]] -,Div ("",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "2013.",Space,Emph [Str "Title"],Str ".",Space,Str "2",Space,Str "vols.",Space,Str "Location:",Space,Str "Publisher."]]]] +,Div ("references",["references"],[]) [Div ("ref-item1",[],[]) [Para [Str "Author,",Space,Str "Al.",Space,Str "2013.",Space,Emph [Str "Title"],Str ".",Space,Str "2",Space,Str "vols.",Space,Str "Location:",Space,Str "Publisher."]]]] diff --git a/tests/test-pandoc-citeproc.hs b/tests/test-pandoc-citeproc.hs --- a/tests/test-pandoc-citeproc.hs +++ b/tests/test-pandoc-citeproc.hs @@ -5,7 +5,6 @@ import System.Directory import System.FilePath import Data.Maybe (fromMaybe) -import Text.Printf import System.IO import Data.Monoid (mempty) import System.IO.Temp (withSystemTempDirectory) @@ -66,10 +65,12 @@ expectedNative <- readFile $ "tests/" ++ csl ++ ".expected.native" let jsonIn = Aeson.encode $ (read indataNative :: Pandoc) let expectedDoc = normalize $ read expectedNative - + testProgPath <- getExecutablePath + let pandocCiteprocPath = takeDirectory testProgPath ".." + "pandoc-citeproc" "pandoc-citeproc" (ec, jsonOut, errout) <- pipeProcess (Just [("LANG","en_US.UTF-8"),("HOME",".")]) - "dist/build/pandoc-citeproc/pandoc-citeproc" + pandocCiteprocPath [] jsonIn if ec == ExitSuccess then do @@ -111,9 +112,12 @@ let (biblines, yamllines) = break (== yamlStart) $ BL.lines raw let bib = BL.unlines biblines let expected = BL.unlines yamllines + testProgPath <- getExecutablePath + let pandocCiteprocPath = takeDirectory testProgPath ".." + "pandoc-citeproc" "pandoc-citeproc" (ec, result, errout) <- pipeProcess (Just [("LANG","en_US.UTF-8"),("HOME",".")]) - "dist/build/pandoc-citeproc/pandoc-citeproc" + pandocCiteprocPath ["--bib2yaml", "-f", drop 1 $ takeExtension fp] bib if ec == ExitSuccess then do