diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,9 @@ +pandoc-citeproc (0.16.0.1) + + * Fix regression on #213. Literals without special handling + (such as call-number, dimensions, scale, language) were being + dropped. Added regression test. + pandoc-citeproc (0.16) * Detect en dash in page range (Andrew Dunning). Ensure that `--` or `–` 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,7 +1,7 @@ .\"t .\" Automatically generated by Pandoc 2.5 .\" -.TH "pandoc\-citeproc" "1" "2018-11-27" "pandoc-citeproc 0.15.0.1" "" +.TH "pandoc\-citeproc" "1" "2019-02-06" "pandoc-citeproc 0.16.0.1" "" .hy .SH NAME .PP 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.16 +version: 0.16.0.1 cabal-version: 1.12 synopsis: Supports using pandoc with 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 @@ -312,19 +312,26 @@ getFormattedValue :: [Option] -> Abbreviations -> Form -> Formatting -> String -> Value -> [Output] getFormattedValue o as f fm s val - | Just v <- fromValue val :: Maybe Formatted = - if v == mempty - then [] - else let ys = unFormatted . maybe v fromString - $ getAbbr (stringify $ unFormatted v) - in if null ys - then [] - else [Output [(if s == "status" - then OStatus - else OPan) $ walk value' ys] fm] - | Just v <- fromValue val :: Maybe String = maybe [] (\x -> [OStr x fm]) . getAbbr $ value v - | Just v <- fromValue val :: Maybe Literal = maybe [] (\x -> [OStr x fm]) . getAbbr $ value $ unLiteral v - | Just v <- fromValue val :: Maybe Int = output fm (if v == 0 then [] else show v) + | Just (Formatted v) <- fromValue val :: Maybe Formatted = + case v of + [] -> [] + _ -> case maybe v (unFormatted . fromString) $ getAbbr (stringify v) of + [] -> [] + ys -> [Output [(if s == "status" + then OStatus + else OPan) $ walk value' ys] fm] + | Just v <- fromValue val :: Maybe String = + case value v of + [] -> [] + xs -> case getAbbr xs of + Nothing -> [OStr xs fm] + Just ys -> [OStr ys fm] + | Just (Literal v) <- fromValue val :: Maybe Literal = + case value v of + [] -> [] + xs -> case getAbbr xs of + Nothing -> [OStr xs fm] + Just ys -> [OStr ys fm] | Just v <- fromValue val :: Maybe Int = output fm (if v == 0 then [] else show v) | Just v <- fromValue val :: Maybe CNum = if v == 0 then [] else [OCitNum (unCNum v) fm] | Just v <- fromValue val :: Maybe CLabel = if v == mempty then [] else [OCitLabel (unCLabel v) fm] diff --git a/tests/issue213.expected.native b/tests/issue213.expected.native new file mode 100644 --- /dev/null +++ b/tests/issue213.expected.native @@ -0,0 +1,6 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "https://raw.githubusercontent.com/citation-style-language/styles/master/harvard-university-of-kent.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Ann"])])]),("collection-title",MetaInlines [Str "The",Space,Str "collection",Space,Str "title"]),("dimensions",MetaInlines [Str "789",Space,Str "pp."]),("id",MetaInlines [Str "doe1"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1999"])])]),("publisher",MetaInlines [Str "The",Space,Str "publisher"]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "book"])])])]}) +[Para [Str "Foo",Space,Cite [Citation {citationId = "doe1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Doe",Space,Str "1999)"],Str "."] +,Header 1 ("references",["unnumbered"],[]) [Str "References"] +,Div ("refs",["references"],[]) + [Div ("ref-doe1",[],[]) + [Para [Str "Doe,",Space,Str "A.",Space,Str "(1999).",Space,Emph [Str "Title"],Str ".",Space,Str "The",Space,Str "collection",Space,Str "title.",Space,Str "The",Space,Str "publisher.",Space,Str "789",Space,Str "pp."]]]] diff --git a/tests/issue213.in.native b/tests/issue213.in.native new file mode 100644 --- /dev/null +++ b/tests/issue213.in.native @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "https://raw.githubusercontent.com/citation-style-language/styles/master/harvard-university-of-kent.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Ann"])])]),("collection-title",MetaInlines [Str "The",Space,Str "collection",Space,Str "title"]),("dimensions",MetaInlines [Str "789",Space,Str "pp."]),("id",MetaInlines [Str "doe1"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "1999"])])]),("publisher",MetaInlines [Str "The",Space,Str "publisher"]),("title",MetaInlines [Str "Title"]),("type",MetaInlines [Str "book"])])])]}) +[Para [Str "Foo",Space,Cite [Citation {citationId = "doe1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@doe1]"],Str "."] +,Header 1 ("references",["unnumbered"],[]) [Str "References"]] diff --git a/tests/jats.csl b/tests/jats.csl new file mode 100644 --- /dev/null +++ b/tests/jats.csl @@ -0,0 +1,208 @@ + + +