diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Copyright (c) 2008-2013, Andrea Rossato -Copyright (c) 2013-2015, John MacFarlane +Copyright (c) 2013-2017, John MacFarlane All rights reserved. Redistribution and use in source and binary forms, with or without modification, diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,67 @@ +pandoc-citeproc (0.10.5) + + * Use file-embed instead of hsb2hs for embed_data_files flag (#285). + * Allow `&` in bibtex keys (#289). They are discouraged because of + problems in tables, but technically they are allowed. + * Allow + in bibtex field name (#290). BibLaTeX now allows things like + `author+an` for annotations. See "Data Annotations" in the bibtex manual. + Note that we don't actually parse the annotations, we just don't + crash on bibtex files that include them. + * caseTransform: fix corner case where last word has internal periods + (#288). E.g. in `www.example.com`, previously `com` was capitalized + as the last word. + * If there's a list of csl, locale, or abbrev files, use the last one. + * Don't catch exceptions in reading CSL file. Previously some exceptions + were silently caught, leading to unexpected use of the default. + * Util.findFile: return right away if absolute path. + * Added mechanism for inserting raw content into delimiters, prefixes, suffixes. + So, for example, in your CSL file you can have + + prefix="{{html}}<i>{{/html}}" + + and this will turn into + + RawInline (Format "html") "" + + rather than, as before + + Str "", + + which would get escaped in the output. + See jgm/pandoc#3536 for the motivation. + * Text.CSL.Pandoc: Simplified code for looking up default CSL. + * Fix titlecase bug involving em/en dashes (#284). + * Export license from Text.CSL.Data.Embedded. + * Added `--license` to CLI and `getLicense` to Text.CSL.Data (API change). + * Updated chicago-author-date.csl and locales xml. + * Add `getManPage` to Text.CSL.Data and `--man` option to CLI (API change). + `pandoc-citeproc --man` now simply spits out the man page in + groff format. For a plain text version, use + `pandoc-citeproc --man | groff -mman -Tutf8`. For an HTML version, + `pandoc-citeproc --man | groff -mman -Thtml`. + * Updates to be able to compile and test with current pandoc HEAD. + * Automatically link ISBN references to Worldcat (#279). + This is similar to existing support for DOIs. Thanks to Eric Marsden. + * Text.CSL.Input.Bibtex: export `Lang`, `langToLocale`, `getLangFromEnv` + (#281, API change). + * Adjusted treatment of `\hyphen` now that pandoc includes trailing space... + in RawInline. See jgm/pandoc#1773 and commit + f4a452f89174828fea77614a4b6a067fc4675ba5. + * Support citation-label variable (#160, Lukas Atkinson). + The `citation-label` was not rendered, even when this label was + explicitly set in the bibliography. This is now fixed. Citation labels + are modelled after citation numbers. In particular, citation labels can + also be hyperlinked. API changes: + + In `Text.CSL,Reference`: The exported type `CLabel` describes a label + name in the CSL variables. This allows us to distinguish labels from + ordinary strings. This type is analogous to `CNum`. + + In `Text.CSL.Style`: In `Output` the `OCitLabel` case describes a label + in the rendered output. This case is analogous to `OCitNum`. + * Allow aeson 1.2. + * Fixed overlapping instance problem in test-citeproc w/ recent aeson. + pandoc-citeproc (0.10.4.1) * Raise version bounds for xml-conduit. diff --git a/chicago-author-date.csl b/chicago-author-date.csl --- a/chicago-author-date.csl +++ b/chicago-author-date.csl @@ -1,5 +1,5 @@ - diff --git a/tests/issue160.expected.native b/tests/issue160.expected.native new file mode 100644 --- /dev/null +++ b/tests/issue160.expected.native @@ -0,0 +1,10 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue160.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("citation-label",MetaInlines [Str "Jane11"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2011")])),("title",MetaInlines [Str "A",Space,Str "book"]),("type",MetaInlines [Str "book"])])])]}) +[Header 2 ("no-citation-label",[],[]) [Str "No",Space,Str "citation-label"] +,Para [Str "Foo",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "[Jane11]"],Str "."] +,Header 2 ("expected",[],[]) [Str "Expected"] +,BlockQuote + [Para [Str "Foo",Space,Str "[Jane11]."] + ,Para [Str "[Jane11]",Space,Str "Jane",Space,Str "Doe.",Space,Str "A",Space,Str "book.",Space,Str "2011."]] +,Div ("refs",["references"],[]) + [Div ("ref-item1",[],[]) + [Para [Str "[Jane11]",Space,Str "Jane",Space,Str "Doe.",Space,Str "A",Space,Str "book.",Space,Str "2011."]]]] diff --git a/tests/issue160.in.native b/tests/issue160.in.native new file mode 100644 --- /dev/null +++ b/tests/issue160.in.native @@ -0,0 +1,7 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/issue160.csl"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("citation-label",MetaInlines [Str "Jane11"]),("id",MetaInlines [Str "item1"]),("issued",MetaMap (fromList [("year",MetaString "2011")])),("title",MetaInlines [Str "A",Space,Str "book"]),("type",MetaInlines [Str "book"])])])]}) +[Header 2 ("no-citation-label",[],[]) [Str "No",Space,Str "citation-label"] +,Para [Str "Foo",Space,Cite [Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item1]"],Str "."] +,Header 2 ("expected",[],[]) [Str "Expected"] +,BlockQuote + [Para [Str "Foo",Space,Str "[Jane11]."] + ,Para [Str "[Jane11]",Space,Str "Jane",Space,Str "Doe.",Space,Str "A",Space,Str "book.",Space,Str "2011."]]] diff --git a/tests/jats.csl b/tests/jats.csl new file mode 100644 --- /dev/null +++ b/tests/jats.csl @@ -0,0 +1,208 @@ + + + diff --git a/tests/test-citeproc.hs b/tests/test-citeproc.hs --- a/tests/test-citeproc.hs +++ b/tests/test-citeproc.hs @@ -1,5 +1,6 @@ {-# LANGUAGE OverloadedStrings, TypeSynonymInstances, FlexibleInstances, - ScopedTypeVariables #-} + ScopedTypeVariables, CPP #-} + import Text.Printf import System.Exit import qualified Control.Exception as E @@ -16,7 +17,6 @@ import System.FilePath import System.Directory import Data.List (sort, isInfixOf) -import qualified Data.Vector as V import qualified Data.Map as M import Text.CSL.Style hiding (Number) import Text.CSL.Reference @@ -72,9 +72,12 @@ x -> fail $ "Could not parse CiteObject" ++ show x parseJSON x = fail $ "Could not parse CiteObject " ++ show x +#if MIN_VERSION_aeson(0,10,0) +#else instance FromJSON [CiteObject] where parseJSON (Array v) = mapM parseJSON $ V.toList v parseJSON _ = return [] +#endif data TestResult = Passed 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 @@ -1,8 +1,10 @@ {-# LANGUAGE CPP #-} +{-# LANGUAGE ScopedTypeVariables #-} module Main where import System.Exit import System.Directory import System.FilePath +import qualified Control.Exception as E import Data.Maybe (fromMaybe) import System.IO import Data.Monoid (mempty) @@ -99,8 +101,16 @@ biblio2yamlTest :: String -> IO TestResult biblio2yamlTest fp = do hPutStr stderr $ "[biblio2yaml/" ++ fp ++ "] " - let yamlf = "tests/biblio2yaml/" ++ fp - raw <- UTF8.readFile yamlf + let yamld = "tests/biblio2yaml/" +#if MIN_VERSION_pandoc(2,0,0) + -- in a few cases we need different test output for pandoc >= 2 + -- because smallcaps render differently, for example. + raw <- E.catch (UTF8.readFile (yamld ++ "/pandoc-2/" ++ fp)) + (\(_ :: E.SomeException) -> + (UTF8.readFile (yamld ++ fp))) +#else + raw <- UTF8.readFile (yamld ++ fp) +#endif let yamlStart = "---" let (biblines, yamllines) = break (== yamlStart) $ lines raw let bib = unlines biblines