From 7d54e790915e16d232ca1e269a858cc9359eb08e Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 3 Oct 2020 16:07:55 -0700 Subject: Use latest citeproc. Update chicago-fullnute-bibliography test, which is now correct. --- cabal.project | 2 +- stack.yaml | 2 +- .../command/pandoc-citeproc-chicago-fullnote-bibliography.md | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index 724583eb6..2227b793f 100644 --- a/cabal.project +++ b/cabal.project @@ -7,6 +7,6 @@ package pandoc source-repository-package type: git location: https://github.com/jgm/citeproc - tag: 342a1d3bc2fcd5b4a1586962aedada5f31db606a + tag: dd561dc5bb359b3fb015b5ccbb5b657d80c2f415 constraints: base16-bytestring < 1 diff --git a/stack.yaml b/stack.yaml index b1d1be078..695c4a4f8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -7,7 +7,7 @@ packages: - '.' extra-deps: - git: https://github.com/jgm/citeproc - commit: 342a1d3bc2fcd5b4a1586962aedada5f31db606a + commit: dd561dc5bb359b3fb015b5ccbb5b657d80c2f415 - pandoc-types-1.22 - texmath-0.12.0.3 - rfc5051-0.2 diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md index 1a569f7e3..ff23c326c 100644 --- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md +++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md @@ -56,7 +56,7 @@ Pandoc with citeproc-hs [^2] -[Doe](#ref-item1)[^3] says blah. +[John Doe](#ref-item1)[^3] says blah. [Doe](#ref-item1)[^4] says blah. @@ -102,15 +102,17 @@ Sam Smith. Oxford: Oxford University Press, 2007. [^2]: [**Nonexistent?**](#ref-nonexistent) -[^3]: [*First Book*, 2005](#ref-item1). +[^3]: [*First Book* (Cambridge: Cambridge University Press, + 2005)](#ref-item1). [^4]: [Ibid., 30](#ref-item1). [^5]: [Ibid.](#ref-item1), with suffix. -[^6]: [*First Book*, 2005](#ref-item1); ["Article," 2006, - 30](#ref-item2); see also [Doe and Roe, "Why Water Is - Wet"](#ref-пункт3). +[^6]: [*First Book*, 2005](#ref-item1); ["Article," *Journal of Generic + Studies* 6 (2006): 30](#ref-item2); see also [John Doe and Jenny + Roe, "Why Water Is Wet," in *Third Book*, ed. Sam Smith (Oxford: + Oxford University Press, 2007)](#ref-пункт3). [^7]: [Doe and Roe](#ref-пункт3) (["Why Water Is Wet," 12](#ref-пункт3)) and a citation without locators ([Doe and Roe, "Why Water Is -- cgit v1.2.3