commit ghc-pandoc-citeproc for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-pandoc-citeproc for openSUSE:Factory checked in at 2019-02-17 12:20:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-pandoc-citeproc (Old) and /work/SRC/openSUSE:Factory/.ghc-pandoc-citeproc.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-pandoc-citeproc" Sun Feb 17 12:20:16 2019 rev:3 rq:674302 version:0.16.0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-pandoc-citeproc/ghc-pandoc-citeproc.changes 2018-12-28 12:35:26.551958422 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-pandoc-citeproc.new.28833/ghc-pandoc-citeproc.changes 2019-02-17 12:20:19.556217306 +0100 @@ -1,0 +2,36 @@ +Fri Feb 8 03:01:31 UTC 2019 - psimons@suse.com + +- Update pandoc-citeproc to version 0.16.0.2. + pandoc-citeproc (0.16.0.2) + + * Remove need for HTTP access in test for #213. + +------------------------------------------------------------------- +Thu Feb 7 13:48:57 UTC 2019 - psimons@suse.com + +- Update pandoc-citeproc to version 0.16.0.1. + 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. + +------------------------------------------------------------------- +Thu Jan 31 03:01:55 UTC 2019 - psimons@suse.com + +- Update pandoc-citeproc to version 0.16. + pandoc-citeproc (0.16) + + * Detect en dash in page range (Andrew Dunning). Ensure that `--` or `–` + are detected as page ranges. This fixes a regression that caused the + second half of the range to be appended to a URL in note styles. + + * Fix collapsing behavior with items with status but no year (#371). + + * Style: Add OStatus constructor to Output [API change]. + + * Allow pandoc 2.6. + + * Added pandoc-citeproc to build-tools for test suite (#369). + +------------------------------------------------------------------- Old: ---- pandoc-citeproc-0.15.0.1.tar.gz New: ---- pandoc-citeproc-0.16.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-pandoc-citeproc.spec ++++++ --- /var/tmp/diff_new_pack.0nOfUF/_old 2019-02-17 12:20:20.364217085 +0100 +++ /var/tmp/diff_new_pack.0nOfUF/_new 2019-02-17 12:20:20.364217085 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-pandoc-citeproc # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name pandoc-citeproc %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.15.0.1 +Version: 0.16.0.2 Release: 0 Summary: Supports using pandoc with citeproc License: BSD-3-Clause ++++++ pandoc-citeproc-0.15.0.1.tar.gz -> pandoc-citeproc-0.16.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/changelog new/pandoc-citeproc-0.16.0.2/changelog --- old/pandoc-citeproc-0.15.0.1/changelog 2018-11-28 01:13:12.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/changelog 2019-02-07 18:58:22.000000000 +0100 @@ -1,3 +1,27 @@ +pandoc-citeproc (0.16.0.2) + + * Remove need for HTTP access in test for #213. + +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 `–` + are detected as page ranges. This fixes a regression that caused the + second half of the range to be appended to a URL in note styles. + + * Fix collapsing behavior with items with status but no year (#371). + + * Style: Add OStatus constructor to Output [API change]. + + * Allow pandoc 2.6. + + * Added pandoc-citeproc to build-tools for test suite (#369). + pandoc-citeproc (0.15.0.1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/man/man1/pandoc-citeproc.1 new/pandoc-citeproc-0.16.0.2/man/man1/pandoc-citeproc.1 --- old/pandoc-citeproc-0.15.0.1/man/man1/pandoc-citeproc.1 2018-11-28 01:13:12.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/man/man1/pandoc-citeproc.1 2019-02-07 18:58:22.000000000 +0100 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/pandoc-citeproc.cabal new/pandoc-citeproc-0.16.0.2/pandoc-citeproc.cabal --- old/pandoc-citeproc-0.15.0.1/pandoc-citeproc.cabal 2018-11-28 01:13:12.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/pandoc-citeproc.cabal 2019-02-07 18:58:22.000000000 +0100 @@ -1,5 +1,5 @@ name: pandoc-citeproc -version: 0.15.0.1 +version: 0.16.0.2 cabal-version: 1.12 synopsis: Supports using pandoc with citeproc @@ -103,7 +103,7 @@ build-depends: containers, directory, mtl, bytestring, filepath, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.6, + pandoc >= 1.16 && < 2.7, tagsoup, aeson >= 0.7 && < 1.5, text, @@ -153,7 +153,7 @@ ghc-prof-options: -fprof-auto-exported -rtsopts build-depends: base >= 4, pandoc-citeproc, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.6, + pandoc >= 1.16 && < 2.7, aeson, aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, filepath @@ -182,7 +182,7 @@ Buildable: False build-depends: base >= 4, aeson, directory, text, mtl, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.6, + pandoc >= 1.16 && < 2.7, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.32, containers >= 0.4, vector >= 0.10 @@ -196,6 +196,7 @@ default-language: Haskell2010 default-extensions: CPP, NoImplicitPrelude other-modules: Text.CSL.Compat.Pandoc + build-tools: pandoc-citeproc test-suite test-pandoc-citeproc Type: exitcode-stdio-1.0 @@ -204,7 +205,7 @@ Hs-Source-Dirs: tests, compat build-depends: base >= 4, aeson, directory, text, pandoc-types >= 1.17.3 && < 1.18, mtl, - pandoc >= 1.16 && < 2.6, filepath, containers, + pandoc >= 1.16 && < 2.7, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, yaml >= 0.8.32 ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -threaded @@ -217,3 +218,4 @@ default-language: Haskell2010 default-extensions: CPP, NoImplicitPrelude other-modules: Text.CSL.Compat.Pandoc + build-tools: pandoc-citeproc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Eval/Output.hs new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Eval/Output.hs --- old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Eval/Output.hs 2018-11-28 01:13:11.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Eval/Output.hs 2019-02-07 18:58:22.000000000 +0100 @@ -87,6 +87,7 @@ | Output [] _ <- o = Nothing | OStr [] _ <- o = Nothing | OPan [] <- o = Nothing + | OStatus [] <- o = Nothing | ODel [] <- o = Nothing | otherwise = Just o @@ -131,6 +132,7 @@ case o of OSpace -> Formatted [Space] OPan i -> Formatted i + OStatus i -> Formatted i ODel [] -> Formatted [] ODel " " -> Formatted [Space] ODel "\n" -> Formatted [SoftBreak] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Eval.hs new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Eval.hs --- old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Eval.hs 2018-11-28 01:13:11.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Eval.hs 2019-02-07 18:58:22.000000000 +0100 @@ -230,6 +230,12 @@ "year-suffix" -> getStringVar "ref-id" >>= \k -> return . return $ OYearSuf [] k [] fm + "status" -> do + (opts, as) <- gets (env >>> options &&& abbrevs) + r <- getVar mempty (getFormattedValue opts as f fm s) + "status" + consumeVariable s + return r "page" -> getStringVar "page" >>= formatRange fm "locator" -> getLocVar >>= formatRange fm . snd "url" -> getStringVar "url" >>= \k -> @@ -306,17 +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 [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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Pandoc.hs new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Pandoc.hs --- old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Pandoc.hs 2018-11-28 01:13:11.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Pandoc.hs 2019-02-07 18:58:22.000000000 +0100 @@ -630,6 +630,7 @@ isLocatorPunct :: Char -> Bool isLocatorPunct '-' = False -- page range +isLocatorPunct '–' = False -- page range, en dash isLocatorPunct ':' = False -- vol:page-range hack isLocatorPunct c = isPunctuation c -- includes [{()}] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Proc/Collapse.hs new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Proc/Collapse.hs --- old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Proc/Collapse.hs 2018-11-28 01:13:11.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Proc/Collapse.hs 2019-02-07 18:58:22.000000000 +0100 @@ -97,6 +97,7 @@ | OYearSuf {} : _ <- o = [head o] | OLoc {} : _ <- o = [head o] | ODel _ : OLoc {} : _ <- o = [head o] + | OStatus {} : _ <- o = [head o] | otherwise = [] collapseYear :: Style -> String -> CitationGroup -> CitationGroup diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Style.hs new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Style.hs --- old/pandoc-citeproc-0.15.0.1/src/Text/CSL/Style.hs 2018-11-28 01:13:11.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/src/Text/CSL/Style.hs 2019-02-07 18:58:22.000000000 +0100 @@ -676,6 +676,7 @@ = ONull | OSpace | OPan [Inline] + | OStatus [Inline] | ODel String -- ^ A delimiter string. | OStr String Formatting -- ^ A simple 'String' | OErr CiteprocError -- ^ Warning message diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/stack.yaml new/pandoc-citeproc-0.16.0.2/stack.yaml --- old/pandoc-citeproc-0.15.0.1/stack.yaml 2018-11-28 01:13:12.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/stack.yaml 2019-02-07 18:58:22.000000000 +0100 @@ -8,20 +8,7 @@ static: false packages: - '.' -extra-deps: -- rfc5051-0.1.0.3 -- hs-bibutils-6.6.0.0 -- pandoc-2.4 -- haddock-library-1.7.0 -- HsYAML-0.1.1.2 -- texmath-0.11.1.2 -- yaml-0.11.0.0 -- libyaml-0.1.0.0 -- cmark-gfm-0.1.6 -- hslua-1.0.1 -- hslua-module-text-0.2.0 -- skylighting-0.7.4 -- skylighting-core-0.7.4 +extra-deps: [] ghc-options: "$locals": -fhide-source-paths -resolver: lts-12.18 +resolver: lts-13.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/harvard-university-of-kent.csl new/pandoc-citeproc-0.16.0.2/tests/harvard-university-of-kent.csl --- old/pandoc-citeproc-0.15.0.1/tests/harvard-university-of-kent.csl 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/harvard-university-of-kent.csl 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="utf-8"?> +<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-GB"> + <info> + <title>University of Kent - Harvard</title> + <id>http://www.zotero.org/styles/harvard-university-of-kent</id> + <link href="http://www.zotero.org/styles/harvard-university-of-kent" rel="self"/> + <link href="http://www.zotero.org/styles/harvard-cardiff-university-biosi" rel="template"/> + <link href="http://www.kent.ac.uk/ai/Harvard-Style-Guide-July-2014.pdf" rel="documentation"/> + <author> + <name>Sebastian Karcher</name> + </author> + <category citation-format="author-date"/> + <category field="generic-base"/> + <summary>The Harvard author-date style - adapted for the University of Kent</summary> + <updated>2012-09-27T22:06:38+00:00</updated> + <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> + </info> + <macro name="editor"> + <names variable="editor" delimiter=", "> + <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/> + <label form="short" prefix=" "/> + </names> + </macro> + <macro name="author"> + <names variable="author"> + <name name-as-sort-order="all" and="text" sort-separator=", " initialize-with="." delimiter-precedes-last="never" delimiter=", "/> + <label form="short" prefix=" "/> + <et-al font-style="italic"/> + <substitute> + <names variable="editor"/> + <text macro="title-substitute"/> + </substitute> + </names> + </macro> + <macro name="author-short"> + <names variable="author"> + <name form="short" and="text" delimiter=", " delimiter-precedes-last="never" initialize-with=". "/> + <et-al font-style="italic"/> + <substitute> + <names variable="editor"/> + <text macro="title-substitute"/> + </substitute> + </names> + </macro> + <macro name="access"> + <choose> + <if variable="URL"> + <group delimiter=" "> + <group delimiter=": "> + <text term="available at" text-case="capitalize-first"/> + <text variable="URL"/> + </group> + <group prefix="[" suffix="]" delimiter=": "> + <text term="accessed" text-case="capitalize-first"/> + <date variable="accessed"> + <date-part name="day" suffix=" "/> + <date-part name="month" suffix=" "/> + <date-part name="year"/> + </date> + </group> + </group> + </if> + </choose> + </macro> + <macro name="title"> + <choose> + <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any"> + <text variable="title" font-style="italic" text-case="title"/> + </if> + <else> + <text variable="title"/> + </else> + </choose> + </macro> + <macro name="title-substitute"> + <choose> + <if type="bill book graphic legal_case legislation motion_picture report song thesis webpage" match="any"> + <text variable="title" font-style="italic" text-case="title"/> + </if> + <else-if type="broadcast"> + <choose> + <if variable="container-title"> + <text variable="title"/> + </if> + <else> + <text variable="title" font-style="italic"/> + </else> + </choose> + </else-if> + <else> + <text variable="title"/> + </else> + </choose> + </macro> + <macro name="publisher"> + <choose> + <if type="thesis"> + <text variable="publisher"/> + </if> + <else-if type="graphic"> + <text variable="archive"/> + </else-if> + <else> + <group delimiter=": "> + <text variable="publisher-place"/> + <text variable="publisher"/> + </group> + </else> + </choose> + </macro> + <macro name="year-date"> + <choose> + <if variable="issued"> + <date variable="issued"> + <date-part name="year"/> + </date> + </if> + <else> + <text term="no date" form="short"/> + </else> + </choose> + </macro> + <macro name="edition"> + <choose> + <if is-numeric="edition"> + <group delimiter=" "> + <number variable="edition" form="ordinal"/> + <text term="edition" form="short"/> + </group> + </if> + <else> + <text variable="edition" suffix="."/> + </else> + </choose> + </macro> + <macro name="online"> + <choose> + <if variable="medium"> + <text variable="medium" prefix="[" suffix="]"/> + </if> + <else-if variable="URL"> + <text term="online" text-case="capitalize-first" prefix="[" suffix="]"/> + </else-if> + </choose> + </macro> + <macro name="broadcast-info"> + <choose> + <if type="broadcast"> + <group delimiter=". "> + <text variable="container-title" font-style="italic"/> + <text variable="number"/> + </group> + </if> + </choose> + </macro> + <macro name="pages"> + <group> + <label variable="page" form="short" suffix=" "/> + <text variable="page"/> + </group> + </macro> + <citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true"> + <layout prefix="(" suffix=")" delimiter="; "> + <group delimiter=", "> + <group delimiter=" "> + <text macro="author-short"/> + <text macro="year-date"/> + </group> + <group> + <label variable="locator" form="short"/> + <text variable="locator"/> + </group> + </group> + </layout> + </citation> + <bibliography et-al-min="4" et-al-use-first="1" hanging-indent="true"> + <sort> + <key macro="author"/> + <key variable="title"/> + </sort> + <layout suffix="."> + <text macro="author"/> + <date variable="issued" prefix=" (" suffix=")."> + <date-part name="year"/> + </date> + <choose> + <if type="book broadcast graphic legal_case motion_picture report song" match="any"> + <group prefix=" " delimiter=". " suffix="."> + <text macro="title"/> + <text macro="broadcast-info"/> + <text macro="online"/> + <group delimiter=" "> + <text term="volume" form="short" text-case="capitalize-first"/> + <text variable="volume"/> + </group> + <text macro="edition"/> + <text macro="editor"/> + <text variable="collection-title"/> + <text variable="collection-number" prefix="Number "/> + <text macro="publisher"/> + <text variable="dimensions"/> + </group> + </if> + <else-if type="chapter paper-conference" match="any"> + <text macro="title" prefix=" " suffix="."/> + <group prefix=" " delimiter=" "> + <text term="in" text-case="capitalize-first" suffix=":"/> + <text macro="editor"/> + <text variable="container-title" font-style="italic" suffix="." text-case="title"/> + <text macro="edition"/> + <group suffix="." delimiter=", "> + <text macro="publisher"/> + <text macro="pages"/> + </group> + </group> + </else-if> + <else-if type="thesis"> + <group prefix=" " delimiter=". " suffix="."> + <text macro="title"/> + <group delimiter=", "> + <text variable="genre"/> + <text macro="publisher"/> + </group> + </group> + </else-if> + <else-if type="webpage"> + <group prefix=" " suffix="."> + <group delimiter=" " suffix="."> + <text macro="title"/> + <text macro="online"/> + </group> + <text macro="edition"/> + </group> + </else-if> + <else> + <group suffix="."> + <text macro="title" prefix=" "/> + <text macro="editor" prefix=" "/> + </group> + <group prefix=" " suffix="."> + <group delimiter=" "> + <text variable="container-title" font-style="italic"/> + <text macro="online"/> + </group> + <text variable="volume" font-weight="bold" prefix=" "/> + <text variable="page" prefix=":"/> + </group> + </else> + </choose> + <text prefix=". " macro="access" suffix="."/> + </layout> + </bibliography> +</style> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/issue213.expected.native new/pandoc-citeproc-0.16.0.2/tests/issue213.expected.native --- old/pandoc-citeproc-0.15.0.1/tests/issue213.expected.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/issue213.expected.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,6 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/issue213.in.native new/pandoc-citeproc-0.16.0.2/tests/issue213.in.native --- old/pandoc-citeproc-0.15.0.1/tests/issue213.in.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/issue213.in.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/issue371.expected.native new/pandoc-citeproc-0.16.0.2/tests/issue371.expected.native --- old/pandoc-citeproc-0.15.0.1/tests/issue371.expected.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/issue371.expected.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,8 @@ +Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item1"]),("status",MetaInlines [Str "in",Space,Str "press"]),("title",MetaInlines [Str "Title",Space,Str "one"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item2"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2018"])])]),("title",MetaInlines [Str "Title",Space,Str "two"]),("type",MetaInlines [Str "book"])])])]}) +[Para [Str "Foo",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1},Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Str "(Doe",Space,Str "2018,",Space,Str "in",Space,Str "press)"],Str "."] +,Header 1 ("references",["unnumbered"],[]) [Str "References"] +,Div ("refs",["references"],[]) + [Div ("ref-item2",[],[]) + [Para [Str "Doe,",Space,Str "Jane.",Space,Str "2018.",Space,Emph [Str "Title",Space,Str "Two"],Str "."]] + ,Div ("ref-item1",[],[]) + [Para [Str "\8212\8212\8212.",Space,Str "In",Space,Str "press.",Space,Emph [Str "Title",Space,Str "One"],Str "."]]]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/issue371.in.native new/pandoc-citeproc-0.16.0.2/tests/issue371.in.native --- old/pandoc-citeproc-0.15.0.1/tests/issue371.in.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/issue371.in.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,3 @@ +Pandoc (Meta {unMeta = fromList [("references",MetaList [MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item1"]),("status",MetaInlines [Str "in",Space,Str "press"]),("title",MetaInlines [Str "Title",Space,Str "one"]),("type",MetaInlines [Str "book"])]),MetaMap (fromList [("author",MetaList [MetaMap (fromList [("family",MetaInlines [Str "Doe"]),("given",MetaInlines [Str "Jane"])])]),("id",MetaInlines [Str "item2"]),("issued",MetaList [MetaMap (fromList [("year",MetaInlines [Str "2018"])])]),("title",MetaInlines [Str "Title",Space,Str "two"]),("type",MetaInlines [Str "book"])])])]}) +[Para [Str "Foo",Space,Cite [Citation {citationId = "item2", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0},Citation {citationId = "item1", citationPrefix = [], citationSuffix = [], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@item2;",Space,Str "@item1]"],Str "."] +,Header 1 ("references",["unnumbered"],[]) [Str "References"]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/page-range.expected.native new/pandoc-citeproc-0.16.0.2/tests/page-range.expected.native --- old/pandoc-citeproc-0.15.0.1/tests/page-range.expected.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/page-range.expected.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,4 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "https://johnmacfarlane.net/vagueness.pdf"]),("id",MetaInlines [Str "test1"])]),MetaMap (fromList [("URL",MetaInlines [Str "https://pandoc.org"]),("id",MetaInlines [Str "test2"])]),MetaMap (fromList [("URL",MetaInlines [Str "https://johnmacfarlane.net"]),("id",MetaInlines [Str "test3"])])]),("suppress-bibliography",MetaBool True)]}) +[Para [Str "Test",Space,Str "1",Str ".",Cite [Citation {citationId = "test1", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93\8211\&101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 1}] [Note [Para [Str "N.d.,",Space,Str "93\8211\&101,",Space,Link ("",[],[]) [Str "https://johnmacfarlane.net/vagueness.pdf"] ("https://johnmacfarlane.net/vagueness.pdf",""),Str "."]]]] +,Para [Str "Test",Space,Str "2",Str ".",Cite [Citation {citationId = "test2", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93\8211\&101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 2}] [Note [Para [Str "N.d.,",Space,Str "93\8211\&101,",Space,Link ("",[],[]) [Str "https://pandoc.org"] ("https://pandoc.org",""),Str "."]]]] +,Para [Str "Test",Space,Str "3",Str ".",Cite [Citation {citationId = "test3", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93-101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 3}] [Note [Para [Str "N.d.,",Space,Str "93\8211\&101,",Space,Link ("",[],[]) [Str "https://johnmacfarlane.net"] ("https://johnmacfarlane.net",""),Str "."]]]]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pandoc-citeproc-0.15.0.1/tests/page-range.in.native new/pandoc-citeproc-0.16.0.2/tests/page-range.in.native --- old/pandoc-citeproc-0.15.0.1/tests/page-range.in.native 1970-01-01 01:00:00.000000000 +0100 +++ new/pandoc-citeproc-0.16.0.2/tests/page-range.in.native 2019-02-07 18:58:22.000000000 +0100 @@ -0,0 +1,4 @@ +Pandoc (Meta {unMeta = fromList [("csl",MetaInlines [Str "tests/chicago-fullnote-bibliography.csl"]),("references",MetaList [MetaMap (fromList [("URL",MetaInlines [Str "https://johnmacfarlane.net/vagueness.pdf"]),("id",MetaInlines [Str "test1"])]),MetaMap (fromList [("URL",MetaInlines [Str "https://pandoc.org"]),("id",MetaInlines [Str "test2"])]),MetaMap (fromList [("URL",MetaInlines [Str "https://johnmacfarlane.net"]),("id",MetaInlines [Str "test3"])])]),("suppress-bibliography",MetaBool True)]}) +[Para [Str "Test",Space,Str "1",Space,Cite [Citation {citationId = "test1", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93\8211\&101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@test1,",Space,Str "pp.",Space,Str "93--101]"],Str "."] +,Para [Str "Test",Space,Str "2",Space,Cite [Citation {citationId = "test2", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93\8211\&101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@test2,",Space,Str "pp.",Space,Str "93\8211\&101]"],Str "."] +,Para [Str "Test",Space,Str "3",Space,Cite [Citation {citationId = "test3", citationPrefix = [], citationSuffix = [Str ",",Space,Str "pp.\160\&93-101"], citationMode = NormalCitation, citationNoteNum = 0, citationHash = 0}] [Str "[@test3,",Space,Str "pp.",Space,Str "93-101]"],Str "."]]
participants (1)
-
root