diff options
author | John MacFarlane <jgm@berkeley.edu> | 2020-10-13 11:05:47 -0700 |
---|---|---|
committer | John MacFarlane <jgm@berkeley.edu> | 2020-10-13 11:06:02 -0700 |
commit | 6fce81fb61bc574780ccb5dbbf17e6c369a5a1c1 (patch) | |
tree | 1f1259268ee44c2e3b8c38d2fcb9129600939d85 | |
parent | 82280cc62c9fdfe7ffe1b0d8443d1739b441e22b (diff) | |
download | pandoc-6fce81fb61bc574780ccb5dbbf17e6c369a5a1c1.tar.gz |
Use latest citeproc (better grouping/collapsing behavior with prefixes).
-rw-r--r-- | cabal.project | 5 | ||||
-rw-r--r-- | stack.yaml | 3 | ||||
-rw-r--r-- | test/command/pandoc-citeproc-chicago-author-date.md | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/cabal.project b/cabal.project index 9503672d4..bc4efd399 100644 --- a/cabal.project +++ b/cabal.project @@ -3,3 +3,8 @@ packages: pandoc.cabal package pandoc flags: +embed_data_files -trypandoc ghc-options: -j +RTS -A64m -RTS + +source-repository-package + type: git + location: https://github.com/jgm/citeproc + tag: a15c87ea0280880d138de774ed1a5deeb655e076 diff --git a/stack.yaml b/stack.yaml index 07e54de4f..72dc84df5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -6,7 +6,6 @@ flags: packages: - '.' extra-deps: -- citeproc-0.1 - pandoc-types-1.22 - texmath-0.12.0.3 - rfc5051-0.2 @@ -23,6 +22,8 @@ extra-deps: - commonmark-0.1.0.2 - commonmark-extensions-0.2.0.1 - commonmark-pandoc-0.2.0.1 +- git: https://github.com/jgm/citeproc + commit: a15c87ea0280880d138de774ed1a5deeb655e076 ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules diff --git a/test/command/pandoc-citeproc-chicago-author-date.md b/test/command/pandoc-citeproc-chicago-author-date.md index 2840f4435..c754387f0 100644 --- a/test/command/pandoc-citeproc-chicago-author-date.md +++ b/test/command/pandoc-citeproc-chicago-author-date.md @@ -103,8 +103,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)). -[^2]: Some citations (see [Doe 2005, chap. 3](#ref-item1); [Doe and Roe - 2007](#ref-пункт3); [Doe 2006](#ref-item2)). +[^2]: Some citations (see [Doe 2005, chap. 3](#ref-item1); + [2006](#ref-item2); [Doe and Roe 2007](#ref-пункт3)). [^3]: Like a citation without author: ([2005](#ref-item1)), and now Doe with a locator ([2006, 44](#ref-item2)). |