From 229e763646f2d743c03972a4118f542dbe0580cb Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 13 Oct 2020 14:52:09 -0700 Subject: [PATCH] Depend on latest citeproc. This fixes the citation number issue with ieee.csl and other styles that do not explicitly sort bibliographies. (Pandoc was numbering them by their order in the bibliography file, rather than the order cited, as required by the CSL spec.) Closes #6741. --- cabal.project | 2 +- stack.yaml | 2 +- test/command/6741.md | 145 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+), 2 deletions(-) create mode 100644 test/command/6741.md diff --git a/cabal.project b/cabal.project index bc4efd399..6649f1768 100644 --- a/cabal.project +++ b/cabal.project @@ -7,4 +7,4 @@ package pandoc source-repository-package type: git location: https://github.com/jgm/citeproc - tag: a15c87ea0280880d138de774ed1a5deeb655e076 + tag: ea3a2b3827df61595ec16408c904ecda96bbdc5f diff --git a/stack.yaml b/stack.yaml index 72dc84df5..0180fc344 100644 --- a/stack.yaml +++ b/stack.yaml @@ -23,7 +23,7 @@ extra-deps: - commonmark-extensions-0.2.0.1 - commonmark-pandoc-0.2.0.1 - git: https://github.com/jgm/citeproc - commit: a15c87ea0280880d138de774ed1a5deeb655e076 + commit: ea3a2b3827df61595ec16408c904ecda96bbdc5f ghc-options: "$locals": -fhide-source-paths -Wno-missing-home-modules diff --git a/test/command/6741.md b/test/command/6741.md new file mode 100644 index 000000000..5fcc0700e --- /dev/null +++ b/test/command/6741.md @@ -0,0 +1,145 @@ +``` +% pandoc --citeproc --csl command/ieee.csl -t plain +--- +title: 'A Simple Citations Test' +author: 'Joanna Doe' +references: +- author: + - family: Mathôt + given: S + container-title: Annual review of vision science + DOI: 10.1146/annurev-vision-030320-062352 + id: mathot2020 + issued: 2020 + title: "Tuning the senses: How the pupil shapes vision at the earliest + stage." + title-short: Tuning the senses + type: article-journal +- author: + - family: Zokaei + given: Nahid + - family: Board + given: Alexander G. + - family: Manohar + given: Sanjay G. + - family: Nobre + given: Anna C. + container-title: Proceedings of the National Academy of Sciences of + the United States of America + DOI: 10.1073/pnas.1909959116 + id: zokaei2019 + issued: 2019 + page: 201909959 + title: Modulation of the pupillary response by the content of visual + working memory + type: article-journal +- author: + - family: Suzuki + given: Y + - family: Minami + given: T + - family: Laeng + given: B + - family: Nakauchi + given: S + container-title: Acta Psychologica + DOI: 10.1016/j.actpsy.2019.102882 + id: suzuki2019 + issued: 2019 + page: 102882 + title: "Colorful glares: Effects of colors on brightness illusions + measured with pupillometry." + title-short: Colorful glares + type: article-journal + volume: 198 +- author: + - family: Brainard + given: David H. + - family: Hurlbert + given: Anya + container-title: Current Biology + DOI: 10.1016/j.cub.2015.05.020 + id: brainard2015a + issue: 13 + issued: 2015 + page: R551-R554 + title: "Colour vision: Understanding \\#TheDress" + title-short: Colour vision + type: article-journal + volume: 25 +- author: + - family: Cavanagh + given: Patrick + container-title: Limits of vision + editor: + - family: Crody-Dillon + given: John R. + id: cavanagh1991 + issued: 1991 + page: 234-250 + publisher: CRC Press + title: Vision at equiluminance + type: chapter +- author: + - family: Brainard + given: David H. + container-title: Annual Review of Vision Science + DOI: 10.1146/annurev-vision-082114-035341 + id: brainard2015 + issued: 2015 + page: 519-546 + title: Color and the cone mosaic + type: article-journal + volume: 1 +... + +# First Heading # +Here is some **text**. And a reference [@brainard2015;@brainard2015a]. + +# Second Heading # +Here is some *text*[@cavanagh1991]. And a reference [@cavanagh1991;@brainard2015]. + +# Third Heading # +Here is some [text]{.underline}. And a reference [@mathot2020;@zokaei2019;@suzuki2019]. + +::: {#refs} +## Bibliography ## +::: +^D +First Heading + +Here is some text. And a reference [1], [2]. + +Second Heading + +Here is some text[3]. And a reference [1], [3]. + +Third Heading + +Here is some text. And a reference [4]–[6]. + +Bibliography + +[1] D. H. Brainard, “Color and the cone mosaic,” Annual Review of Vision +Science, vol. 1, pp. 519–546, 2015. + +[2] D. H. Brainard and A. Hurlbert, “Colour vision: Understanding +#TheDress,” Current Biology, vol. 25, no. 13, pp. R551–R554, 2015. + +[3] P. Cavanagh, “Vision at equiluminance,” in Limits of vision, J. R. +Crody-Dillon, Ed. CRC Press, 1991, pp. 234–250. + +[4] S. Mathôt, “Tuning the senses: How the pupil shapes vision at the +earliest stage.” Annual review of vision science, 2020. + +[5] N. Zokaei, A. G. Board, S. G. Manohar, and A. C. Nobre, “Modulation +of the pupillary response by the content of visual working memory,” +Proceedings of the National Academy of Sciences of the United States of +America, p. 201909959, 2019. + +[6] Y. Suzuki, T. Minami, B. Laeng, and S. Nakauchi, “Colorful glares: +Effects of colors on brightness illusions measured with pupillometry.” +Acta Psychologica, vol. 198, p. 102882, 2019. + +``` +