aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2021-06-29 09:18:00 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2021-06-29 09:18:49 -0700
commitb7572db224123ab6c193ccdf24d2c3dd4fc0b0dc (patch)
treeba582e55833e0546a1b9f3645d9f3358ce2a7d71
parentf4ef652a4165fefe4b587882cc75d1e24971ef1f (diff)
downloadpandoc-b7572db224123ab6c193ccdf24d2c3dd4fc0b0dc.tar.gz
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.
-rw-r--r--cabal.project2
-rw-r--r--stack.yaml2
-rw-r--r--test/command/pandoc-citeproc-chicago-author-date.md14
-rw-r--r--test/command/pandoc-citeproc-chicago-fullnote-bibliography.md13
4 files changed, 15 insertions, 16 deletions
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).