From 27b4c21f727ca02228a1fae8f3cdbba74641ede8 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Thu, 1 Oct 2020 21:55:45 -0700 Subject: Update to lastest citeproc --- cabal.project | 3 ++- src/Text/Pandoc/Citeproc/MetaValue.hs | 1 + stack.yaml | 2 +- test/command/biblatex-edtf-date.md | 1 - test/command/pandoc-citeproc-page-range.md | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cabal.project b/cabal.project index aa67d1750..724583eb6 100644 --- a/cabal.project +++ b/cabal.project @@ -7,5 +7,6 @@ package pandoc source-repository-package type: git location: https://github.com/jgm/citeproc - tag: 1412868a711ad12c2cb5cfc0d6bbba11c7612ce6 + tag: 342a1d3bc2fcd5b4a1586962aedada5f31db606a + constraints: base16-bytestring < 1 diff --git a/src/Text/Pandoc/Citeproc/MetaValue.hs b/src/Text/Pandoc/Citeproc/MetaValue.hs index 53b14f904..1b80c879a 100644 --- a/src/Text/Pandoc/Citeproc/MetaValue.hs +++ b/src/Text/Pandoc/Citeproc/MetaValue.hs @@ -97,6 +97,7 @@ dateToMetaValue date = | y < -1 -> printf "%05d-%02d" (y+1) m | otherwise -> printf "%04d-%02d" y m (y:[]) + | y == 0 -> printf "" -- used for open range | y < -1 -> printf "%05d" (y+1) | otherwise -> printf "%04d" y _ -> mempty diff --git a/stack.yaml b/stack.yaml index a7e664ada..b1d1be078 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,7 +7,7 @@ packages: - '.' extra-deps: - git: https://github.com/jgm/citeproc - commit: 1412868a711ad12c2cb5cfc0d6bbba11c7612ce6 + commit: 342a1d3bc2fcd5b4a1586962aedada5f31db606a - pandoc-types-1.22 - texmath-0.12.0.3 - rfc5051-0.2 diff --git a/test/command/biblatex-edtf-date.md b/test/command/biblatex-edtf-date.md index e14a76cb6..68acd821c 100644 --- a/test/command/biblatex-edtf-date.md +++ b/test/command/biblatex-edtf-date.md @@ -35,7 +35,6 @@ references: issued: '2004-04-05' type: 'article-journal' - id: 'item5-1' - issued: 0000 type: 'article-journal' - id: 'item5-2' issued: '-0876' diff --git a/test/command/pandoc-citeproc-page-range.md b/test/command/pandoc-citeproc-page-range.md index 5a46c5f03..20d6fa57a 100644 --- a/test/command/pandoc-citeproc-page-range.md +++ b/test/command/pandoc-citeproc-page-range.md @@ -24,9 +24,9 @@ Test 2.[^2] Test 3.[^3] -[^1]: 93--101, . +[^1]: N.d., 93--101, . -[^2]: 93--101, . +[^2]: N.d., 93--101, . -[^3]: 93--101, . +[^3]: N.d., 93--101, . ``` -- cgit v1.2.3