aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2020-10-21 23:14:17 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2020-10-21 23:14:17 -0700
commitb87679391085c077ca0b1f5dcdc93e40ba1499c6 (patch)
treed69fd5a25e967437cc5987280c5ab9462e2d5bdf
parentf9c6167ad123032b67f300b2478466063e0ac6f6 (diff)
downloadpandoc-b87679391085c077ca0b1f5dcdc93e40ba1499c6.tar.gz
Use latest citeproc.
This fixes a problem with author-in-text citations for references including both an author and an editor. Previously, both were included in the text, but only the author should be. Closes #6765. Added a test.
-rw-r--r--cabal.project3
-rw-r--r--stack.yaml3
-rw-r--r--test/command/6765.md31
3 files changed, 35 insertions, 2 deletions
diff --git a/cabal.project b/cabal.project
index 74f52cf00..e848f1b45 100644
--- a/cabal.project
+++ b/cabal.project
@@ -7,4 +7,5 @@ package pandoc
source-repository-package
type: git
location: https://github.com/jgm/citeproc
- tag: 0.1.0.2
+ tag: 3230fb6fa1beff3e27389be20217a31d3c1207e9
+
diff --git a/stack.yaml b/stack.yaml
index 8123c43db..3d232763f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -22,7 +22,8 @@ extra-deps:
- commonmark-0.1.0.2
- commonmark-extensions-0.2.0.1
- commonmark-pandoc-0.2.0.1
-- citeproc-0.1.0.2
+- git: https://github.com/jgm/citeproc
+ commit: 3230fb6fa1beff3e27389be20217a31d3c1207e9
ghc-options:
"$locals": -fhide-source-paths -Wno-missing-home-modules
diff --git a/test/command/6765.md b/test/command/6765.md
new file mode 100644
index 000000000..8836d7223
--- /dev/null
+++ b/test/command/6765.md
@@ -0,0 +1,31 @@
+```
+% pandoc --citeproc -t plain
+@book_chapter_1 [55] says blah.
+
+---
+csl: command/chicago-fullnote-bibliography.csl
+references:
+- id: book_chapter_1
+ author:
+ - family: Author
+ given: Ann
+ container-title: A book
+ editor:
+ - family: Editor
+ given: Edward
+ issued: 2014
+ page: 48-67
+ publisher: A publisher
+ publisher-place: A place
+ title: A book chapter
+ type: chapter
+...
+^D
+Ann Author[1] says blah.
+
+Author, Ann. “A Book Chapter.” In A Book, edited by Edward Editor,
+48–67. A place: A publisher, 2014.
+
+[1] “A Book Chapter,” in A Book, ed. Edward Editor (A place: A
+publisher, 2014), 55.
+```