From 3d6ebc905195592897e3a03ef648384ee01f5155 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 15 Jan 2021 11:51:07 -0800 Subject: Use dev version of citeproc. Change a citation test which had wrong disambiguation (see jgm/citeproc#44). --- .../pandoc-citeproc-chicago-fullnote-bibliography.md | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'test/command/pandoc-citeproc-chicago-fullnote-bibliography.md') diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md index 4536342c6..d997d818b 100644 --- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md +++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md @@ -107,7 +107,7 @@ Sam Smith. Oxford: Oxford University Press, 2007. [^5]: [30](#ref-item1), with suffix. -[^6]: [*First Book*, 2005](#ref-item1); ["Article," *Journal of Generic +[^6]: [*First Book*](#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). @@ -116,22 +116,20 @@ Sam Smith. Oxford: Oxford University Press, 2007. and a citation without locators ([Doe and Roe, "Why Water Is Wet"](#ref-пункт3)). -[^8]: See [Doe, *First Book*, 2005, chap. 3](#ref-item1); also [Doe and - Roe, "Why Water Is Wet," 34--35](#ref-пункт3). +[^8]: See [Doe, *First Book*, chap. 3](#ref-item1); also [Doe and Roe, + "Why Water Is Wet," 34--35](#ref-пункт3). -[^9]: See [Doe, *First Book*, 2005, 34--35](#ref-item1). +[^9]: See [Doe, *First Book*, 34--35](#ref-item1). [^10]: Some citations (see [Doe, chap. 3](#ref-item1); [Doe and Roe, - "Why Water Is Wet"](#ref-пункт3); [Doe, "Article," - 2006](#ref-item2)). + "Why Water Is Wet"](#ref-пункт3); [Doe, "Article"](#ref-item2)). -[^11]: [Doe, *First Book*, 2005, 33, 35--37](#ref-item1), and nowhere - else. +[^11]: [Doe, *First Book*, 33, 35--37](#ref-item1), and nowhere else. -[^12]: [Doe, *First Book*, 2005](#ref-item1) and nowhere else. +[^12]: [Doe, *First Book*](#ref-item1) and nowhere else. [^13]: Like a citation without author: (), and again (), and now Doe - with a locator (["Article," 2006, 44](#ref-item2)). + with a locator (["Article," 44](#ref-item2)). -[^14]: *See* [Doe, *First Book*, 2005, 32](#ref-item1). +[^14]: *See* [Doe, *First Book*, 32](#ref-item1). ``` -- cgit v1.2.3 From b7572db224123ab6c193ccdf24d2c3dd4fc0b0dc Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 29 Jun 2021 09:18:00 -0700 Subject: Use dev version of citeproc. This eliminates double hyperlinks in author-in-text citations. Author-only citations are no longer hyperlinked. See jgm/citeproc#77. --- cabal.project | 2 +- stack.yaml | 2 +- test/command/pandoc-citeproc-chicago-author-date.md | 14 +++++++------- .../pandoc-citeproc-chicago-fullnote-bibliography.md | 13 ++++++------- 4 files changed, 15 insertions(+), 16 deletions(-) (limited to 'test/command/pandoc-citeproc-chicago-fullnote-bibliography.md') diff --git a/cabal.project b/cabal.project index ba7f4f4cb..99c7b3556 100644 --- a/cabal.project +++ b/cabal.project @@ -10,4 +10,4 @@ source-repository-package source-repository-package type: git location: https://github.com/jgm/citeproc - tag: d201ddc812b1550d70c3e448eec6d9c3af72d96b + tag: 85277c4baa6c0350baf29247583ae0f438f7c9c5 diff --git a/stack.yaml b/stack.yaml index f67da4ec7..2db0a626f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -14,7 +14,7 @@ extra-deps: - git: https://github.com/jgm/doctemplates commit: 428c26d5303cf7a2b1051fe1ffd9aafe9ba71c81 - git: https://github.com/jgm/citeproc - commit: d201ddc812b1550d70c3e448eec6d9c3af72d96b + commit: 85277c4baa6c0350baf29247583ae0f438f7c9c5 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules resolver: lts-18.0 diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md index a70bc5de8..503dfdc91 100644 --- a/test/command/pandoc-citeproc-chicago-author-date.md +++ b/test/command/pandoc-citeproc-chicago-author-date.md @@ -54,14 +54,14 @@ References {#references .unnumbered} ([**nonexistent?**](#ref-nonexistent)) -[Doe](#ref-item1) ([2005](#ref-item1)) says blah. +Doe ([2005](#ref-item1)) says blah. -[Doe](#ref-item1) ([2005, 30](#ref-item1)) says blah. +Doe ([2005, 30](#ref-item1)) says blah. -[Doe](#ref-item1) ([2005, 30](#ref-item1), with suffix) says blah. +Doe ([2005, 30](#ref-item1), with suffix) says blah. -[Doe](#ref-item1) ([2005](#ref-item1); [2006, 30](#ref-item2); see also -[Doe and Roe 2007](#ref-пункт3)) says blah. +Doe ([2005](#ref-item1); [2006, 30](#ref-item2); see also [Doe and Roe +2007](#ref-пункт3)) says blah. In a note.[^1] @@ -98,8 +98,8 @@ edited by Sam Smith. Oxford: Oxford University Press. ::: ::: -[^1]: [Doe and Roe](#ref-пункт3) ([2007, 12](#ref-пункт3)) and a - citation without locators ([Doe and Roe 2007](#ref-пункт3)). +[^1]: Doe and Roe ([2007, 12](#ref-пункт3)) and a citation without + locators ([Doe and Roe 2007](#ref-пункт3)). [^2]: Some citations (see [Doe 2005, chap. 3](#ref-item1); [2006](#ref-item2); [Doe and Roe 2007](#ref-пункт3)). diff --git a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md index d997d818b..e5ab30a52 100644 --- a/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md +++ b/test/command/pandoc-citeproc-chicago-fullnote-bibliography.md @@ -55,13 +55,13 @@ References {#references .unnumbered} [^2] -[John Doe](#ref-item1)[^3] says blah. +John Doe[^3] says blah. -[Doe](#ref-item1)[^4] says blah. +Doe[^4] says blah. -[Doe](#ref-item1)[^5] says blah. +Doe[^5] says blah. -[Doe](#ref-item1)[^6] says blah. +Doe[^6] says blah. In a note.[^7] @@ -112,9 +112,8 @@ Sam Smith. Oxford: Oxford University Press, 2007. 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 - Wet"](#ref-пункт3)). +[^7]: Doe and Roe, ["Why Water Is Wet," 12](#ref-пункт3) and a citation + without locators ([Doe and Roe, "Why Water Is Wet"](#ref-пункт3)). [^8]: See [Doe, *First Book*, chap. 3](#ref-item1); also [Doe and Roe, "Why Water Is Wet," 34--35](#ref-пункт3). -- cgit v1.2.3