pandoc-citeproc 0.12 → 0.12.1

raw patch · 5 files changed

+21/−2 lines, 5 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• changelog +5/−0
• pandoc-citeproc.cabal +1/−1
• src/Text/CSL/Eval/Names.hs +8/−1
• tests/issue307.expected.native +5/−0
• tests/issue307.in.native +2/−0

@@ -1,3 +1,8 @@+pandoc-citeproc (0.12.1)++  * Fixed cases where we got plural instead of singular "issue"+    or "volume" (#307).+ pandoc-citeproc (0.12)    * Text.CSL.Exception: add `renderError`.

@@ -1,5 +1,5 @@ name:               pandoc-citeproc-version:            0.12+version:            0.12.1 cabal-version:      >= 1.12 synopsis:           Supports using pandoc with citeproc 

@@ -337,7 +337,14 @@  formatTerm :: Form -> Formatting -> Bool -> String -> State EvalState [Output] formatTerm f fm p s = do-  t <- getTerm p f s+  plural <- if s `elem` ["page", "volume", "issue"]+               then do+                 varset <- isVarSet s+                 if varset+                    then isRange <$> getStringVar s+                    else return p+               else return p+  t <- getTerm plural f s   return $ oStr' t fm  formatLabel :: Form -> Formatting -> Bool -> String -> State EvalState [Output]

@@ -0,0 +1,5 @@+Pandoc (Meta {unMeta = fromList [("lang",MetaInlines [Str "fr-FR"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bazin"]),("given",MetaInlines [Str "Andr\233"])])]),("container-title",MetaInlines [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"]),("id",MetaInlines [Str "bazin_cybernetique_1954"]),("issue",MetaInlines [Str "36"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1954",MetaString "6"]])])),("page",MetaInlines [Str "22-27"]),("title",MetaInlines [Str "La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte"]),("type",MetaInlines [Str "article-journal"])])])]})+[Para [Str "Bonjour",Cite [Citation {citationId = "bazin_cybernetique_1954", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Str "(Bazin",Space,Str "1954)"],Space,Str "!"]+,Div ("refs",["references"],[])+ [Div ("ref-bazin_cybernetique_1954",[],[])+  [Para [Str "Bazin,",Space,Str "Andr\233.",Space,Str "1954.",Space,Str "\171\160La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte\160\187.",Space,Emph [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"],Str ",",Space,Str "n\7506",Space,Str "36",Space,Str "(juin):22\8209\&27."]]]]

@@ -0,0 +1,2 @@+Pandoc (Meta {unMeta = fromList [("lang",MetaInlines [Str "fr-FR"]),("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Bazin"]),("given",MetaInlines [Str "Andr\233"])])]),("container-title",MetaInlines [Str "Cahiers",Space,Str "du",Space,Str "cin\233ma"]),("id",MetaInlines [Str "bazin_cybernetique_1954"]),("issue",MetaInlines [Str "36"]),("issued",MetaMap (fromList [("date-parts",MetaList [MetaList [MetaString "1954",MetaString "6"]])])),("page",MetaInlines [Str "22-27"]),("title",MetaInlines [Str "La",Space,Str "Cybern\233tique",Space,Str "d\8217Andr\233",Space,Str "Cayatte"]),("type",MetaInlines [Str "article-journal"])])])]})+[Para [Str "Bonjour",Cite [Citation {citationId = "bazin_cybernetique_1954", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@bazin_cybernetique_1954]"],Space,Str "!"]]