diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,15 @@ +pandoc-citeproc (0.14.4) + + * Allow latest aeson (Adam Bergmark, #336). + * Use latest hs-bibutils. + * NBIB support (#333, Václav Haisman, API change). + * Allow pandoc 2.3.x. + * Update tests for pandoc changes. + * Use recent yaml library that doesn't quote number ranges. + This required some adjustments in the tests. + * Use lts-12 for stack build. + * Use Yaml.decodeEither' instead of deprecated decodeEither. + pandoc-citeproc (0.14.3.1) * Allow pandoc 2.2.x. diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal --- a/pandoc-citeproc.cabal +++ b/pandoc-citeproc.cabal @@ -1,6 +1,6 @@ name: pandoc-citeproc -version: 0.14.3.1 -cabal-version: >= 1.12 +version: 0.14.4 +cabal-version: 1.12 synopsis: Supports using pandoc with citeproc description: The pandoc-citeproc library exports functions for @@ -24,7 +24,7 @@ homepage: https://github.com/jgm/pandoc-citeproc category: Text -tested-with: GHC == 7.8.4, GHC == 7.10.3, GHC == 8.0.1 +tested-with: GHC == 8.0.1, GHC == 8.2.2, GHC == 8.4.3 license: BSD3 license-file: LICENSE author: John MacFarlane, Andrea Rossato @@ -108,16 +108,16 @@ build-depends: containers, directory, mtl, bytestring, filepath, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.3, + pandoc >= 1.16 && < 2.4, tagsoup, - aeson >= 0.7 && < 1.4, + aeson >= 0.7 && < 1.5, text, vector, xml-conduit >= 1.2 && < 1.9, unordered-containers >= 0.2 && < 0.3, data-default, setenv >= 0.1 && < 0.2, - split, yaml >= 0.8.8.7 + split, yaml >= 0.8.32 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -132,7 +132,7 @@ cpp-options: -DTRACE if flag(bibutils) - build-depends: hs-bibutils >= 6.2.0.1 + build-depends: hs-bibutils >= 6.4 cpp-options: -DUSE_BIBUTILS if flag(embed_data_files) @@ -158,7 +158,7 @@ ghc-prof-options: -fprof-auto-exported -rtsopts build-depends: base >= 4, pandoc-citeproc, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.3, + pandoc >= 1.16 && < 2.4, aeson, aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, filepath @@ -187,10 +187,10 @@ Buildable: False build-depends: base >= 4, aeson, directory, text, mtl, pandoc-types >= 1.17.3 && < 1.18, - pandoc >= 1.16 && < 2.3, + pandoc >= 1.16 && < 2.4, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.8.8.7, containers >= 0.4, vector >= 0.10 + yaml >= 0.8.32, containers >= 0.4, vector >= 0.10 if impl(ghc < 8.0) build-depends: semigroups == 0.18.* if impl(ghc < 8.4) @@ -209,9 +209,9 @@ Hs-Source-Dirs: tests, compat build-depends: base >= 4, aeson, directory, text, pandoc-types >= 1.17.3 && < 1.18, mtl, - pandoc >= 1.16 && < 2.3, filepath, containers, + pandoc >= 1.16 && < 2.4, filepath, containers, bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.8.8.7 + yaml >= 0.8.32 ghc-options: -funbox-strict-fields -Wall -fno-warn-unused-do-bind -threaded if impl(ghc < 8.0) build-depends: semigroups == 0.18.* diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs --- a/pandoc-citeproc.hs +++ b/pandoc-citeproc.hs @@ -109,6 +109,7 @@ go "medline" = Just Medline go "copac" = Just Copac go "mods" = Just Mods + go "nbib" = Just Nbib #endif go _ = Nothing diff --git a/src/Text/CSL/Input/Bibutils.hs b/src/Text/CSL/Input/Bibutils.hs --- a/src/Text/CSL/Input/Bibutils.hs +++ b/src/Text/CSL/Input/Bibutils.hs @@ -55,7 +55,7 @@ -- a predicate to filter citation identifiers. -- -- Supported formats are: @json@, @mods@, @bibtex@, @biblatex@, @ris@, --- @endnote@, @endnotexml@, @isi@, @medline@, and @copac@. +-- @endnote@, @endnotexml@, @isi@, @medline@, @copac@, and @nbib@. readBiblioFile :: (String -> Bool) -> FilePath -> IO [Reference] readBiblioFile idpred f = case getExt f of @@ -76,6 +76,7 @@ ".wos" -> readBiblioFile' idpred f isi_in ".medline" -> readBiblioFile' idpred f medline_in ".copac" -> readBiblioFile' idpred f copac_in + ".nbib" -> readBiblioFile' idpred f nbib_in _ -> E.throwIO $ ErrorReadingBibFile f "the format of the bibliographic database could not be recognized from the file extension" #else _ -> E.throwIO $ ErrorReadingBibFile f "bibliography format not supported" @@ -94,6 +95,7 @@ | Medline | Copac | Mods + | Nbib #endif deriving Show @@ -113,6 +115,7 @@ | Medline <- b = go medline_in | Copac <- b = go copac_in | Mods <- b = go mods_in + | Nbib <- b = go nbib_in #endif | otherwise = E.throwIO $ ErrorReadingBib $ "unsupported format " ++ show b @@ -179,7 +182,7 @@ selectEntries :: (String -> Bool) -> BS.ByteString -> BS.ByteString selectEntries idpred bs = - case Yaml.decodeEither bs of + case Yaml.decodeEither' bs of Right (Array vs) -> Yaml.encode (filterObjects $ V.toList vs) Right (Object o) -> case HM.lookup (T.pack "references") o of @@ -188,7 +191,8 @@ (filterObjects $ V.toList vs) mempty) _ -> BS.empty Right _ -> BS.empty - Left e -> E.throw $ ErrorParsingReferences e + Left e -> E.throw $ ErrorParsingReferences + (Yaml.prettyPrintParseException e) where filterObjects = filter (\x -> case x of Object o -> diff --git a/stack.yaml b/stack.yaml --- a/stack.yaml +++ b/stack.yaml @@ -9,21 +9,14 @@ packages: - '.' extra-deps: +- haddock-library-1.6.0 +- HsYAML-0.1.1.1 +- network-2.7.0.2 - rfc5051-0.1.0.3 -- pandoc-2.1.3 -- texmath-0.10.1.1 -- tagsoup-0.14.6 -- pandoc-types-1.17.4.2 -- hslua-0.9.5.1 -- skylighting-0.7.0.2 -- skylighting-core-0.7.0.2 -- xml-conduit-1.8.0 -- conduit-1.3.0.2 -- conduit-extra-1.3.0 -- resourcet-1.2.0 -- cmark-gfm-0.1.3 -- haddock-library-1.5.0.1 -- hslua-module-text-0.1.2.1 +- hs-bibutils-6.5.0.0 +- yaml-0.9.0 +- github: jgm/pandoc + commit: 889254e1d5c7b683b93f623207347a773e25776b ghc-options: "$locals": -fhide-source-paths -resolver: lts-10.10 +resolver: lts-12.0 diff --git a/tests/biblio2yaml/aksin.biblatex b/tests/biblio2yaml/aksin.biblatex --- a/tests/biblio2yaml/aksin.biblatex +++ b/tests/biblio2yaml/aksin.biblatex @@ -47,7 +47,7 @@ - id: aksin type: article-journal author: - - family: Aksin + - family: Aksın given: Özge - family: Türkmen given: Hayati @@ -66,7 +66,7 @@ title: Effect of immobilization on catalytic characteristics of saturated Pd-N-heterocyclic carbenes in Mizoroki-Heck reactions container-title: J. Organomet. Chem. - page: '3027-3036' + page: 3027-3036 volume: '691' issue: '13' ... diff --git a/tests/biblio2yaml/baez-article.biblatex b/tests/biblio2yaml/baez-article.biblatex --- a/tests/biblio2yaml/baez-article.biblatex +++ b/tests/biblio2yaml/baez-article.biblatex @@ -58,7 +58,7 @@ title: 'Higher-dimensional algebra V: 2-groups' title-short: Higher-dimensional algebra V container-title: Theory and Applications of Categories - page: '423-491' + page: 423-491 version: '3' volume: '12' annote: An article with eprint and eprinttype fields. Note that the arXiv reference diff --git a/tests/biblio2yaml/basic.bibtex b/tests/biblio2yaml/basic.bibtex --- a/tests/biblio2yaml/basic.bibtex +++ b/tests/biblio2yaml/basic.bibtex @@ -47,7 +47,7 @@ - year: 2006 title: Article container-title: Journal of Generic Studies - page: '33-34' + page: 33-34 volume: '6' - id: пункт3 diff --git a/tests/biblio2yaml/bertram.biblatex b/tests/biblio2yaml/bertram.biblatex --- a/tests/biblio2yaml/bertram.biblatex +++ b/tests/biblio2yaml/bertram.biblatex @@ -52,7 +52,7 @@ title: Gromov invariants for holomorphic maps on Riemann surfaces title-short: Gromov invariants container-title: J. Amer. Math. Soc. - page: '529-571' + page: 529-571 volume: '9' issue: '2' annote: An article entry with a volume and a number field diff --git a/tests/biblio2yaml/brandt.biblatex b/tests/biblio2yaml/brandt.biblatex --- a/tests/biblio2yaml/brandt.biblatex +++ b/tests/biblio2yaml/brandt.biblatex @@ -72,7 +72,7 @@ collection-number: '2' publisher: Klett-Cotta publisher-place: Stuttgart - page: '884-917' + page: 884-917 annote: An incollection entry with a series and a number. Note the format of the printed name and compare the useprefix option in the options field as well as vangennep. Also note the indextitle, and indexsorttitle fields diff --git a/tests/biblio2yaml/britannica.biblatex b/tests/biblio2yaml/britannica.biblatex --- a/tests/biblio2yaml/britannica.biblatex +++ b/tests/biblio2yaml/britannica.biblatex @@ -72,7 +72,7 @@ annote: This is a collection entry for an encyclopedia. Note the useeditor option in the options field as well as the sorttitle field. We want this entry to be cited and alphabetized by title even though there is an editor. In addition to - that, we want the title to be alphabetized under “E” rather than “T”. Also note + that, we want the title to be alphabetized under ‘E’ rather than ‘T’. Also note the label field which is provided for author-year citation styles language: en-GB ... diff --git a/tests/biblio2yaml/cms.biblatex b/tests/biblio2yaml/cms.biblatex --- a/tests/biblio2yaml/cms.biblatex +++ b/tests/biblio2yaml/cms.biblatex @@ -68,7 +68,7 @@ in the database file which is provided for author-year citation styles. Also note the sorttitle and indextitle fields. By default, all entries without an author or editor are alphabetized by title but we want this entry to be alphabetized - under “C” rather than “T”. There’s also an isbn field - ISBN: '0-226-10403-6' + under ‘C’ rather than ‘T’. There’s also an isbn field + ISBN: 0-226-10403-6 language: en-US ... diff --git a/tests/biblio2yaml/crossref-inbook-mvbook.biblatex b/tests/biblio2yaml/crossref-inbook-mvbook.biblatex --- a/tests/biblio2yaml/crossref-inbook-mvbook.biblatex +++ b/tests/biblio2yaml/crossref-inbook-mvbook.biblatex @@ -36,7 +36,7 @@ container-title: Collected works \[title field of mvbook-1\] publisher: Publisher publisher-place: Location - page: '100-200' + page: 100-200 volume: '3' number-of-volumes: '4' chapter-number: '7' diff --git a/tests/biblio2yaml/crossref-nested.biblatex b/tests/biblio2yaml/crossref-nested.biblatex --- a/tests/biblio2yaml/crossref-nested.biblatex +++ b/tests/biblio2yaml/crossref-nested.biblatex @@ -49,7 +49,7 @@ volume-title: Tragedies \[title field of book-1\] publisher: Publisher publisher-place: Location - page: '100-200' + page: 100-200 volume: '3' number-of-volumes: '4' chapter-number: '7' @@ -67,7 +67,7 @@ volume-title: Tragedies \[title field of book-1\] publisher: Publisher publisher-place: Location - page: '100-200' + page: 100-200 volume: '3' number-of-volumes: '4' chapter-number: '7' diff --git a/tests/biblio2yaml/doody.biblatex b/tests/biblio2yaml/doody.biblatex --- a/tests/biblio2yaml/doody.biblatex +++ b/tests/biblio2yaml/doody.biblatex @@ -72,7 +72,7 @@ - year: 1974 title: Hemingway’s style and Jake’s narration container-title: The Journal of Narrative Technique - page: '212-225' + page: 212-225 volume: '4' issue: '3' annote: An article entry cited as an excerpt from a collection entry. Note the format @@ -89,7 +89,7 @@ title: Contemporary literary criticism publisher: Gale publisher-place: Detroit - page: '204-208' + page: 204-208 volume: '61' annote: A collection entry providing the excerpt information for the doody entry. Note the format of the pages field diff --git a/tests/biblio2yaml/gaonkar-in.biblatex b/tests/biblio2yaml/gaonkar-in.biblatex --- a/tests/biblio2yaml/gaonkar-in.biblatex +++ b/tests/biblio2yaml/gaonkar-in.biblatex @@ -51,6 +51,6 @@ container-title: Alternative modernities publisher: Duke University Press publisher-place: Durham; London - page: '1-23' - ISBN: '0-822-32714-7' + page: 1-23 + ISBN: 0-822-32714-7 ... diff --git a/tests/biblio2yaml/gaonkar.biblatex b/tests/biblio2yaml/gaonkar.biblatex --- a/tests/biblio2yaml/gaonkar.biblatex +++ b/tests/biblio2yaml/gaonkar.biblatex @@ -48,6 +48,6 @@ publisher-place: Durham; London annote: This is a collection entry. Note the format of the location field in the database file as well as the isbn field - ISBN: '0-822-32714-7' + ISBN: 0-822-32714-7 language: en-US ... diff --git a/tests/biblio2yaml/gillies.biblatex b/tests/biblio2yaml/gillies.biblatex --- a/tests/biblio2yaml/gillies.biblatex +++ b/tests/biblio2yaml/gillies.biblatex @@ -55,7 +55,7 @@ title: Herder and the preparation of Goethe’s idea of world literature container-title: Publications of the English Goethe Society collection-title: new series - page: '46-67' + page: 46-67 volume: '9' annote: An article entry with a series and a volume field. Note that format of the series field in the database file diff --git a/tests/biblio2yaml/glashow.biblatex b/tests/biblio2yaml/glashow.biblatex --- a/tests/biblio2yaml/glashow.biblatex +++ b/tests/biblio2yaml/glashow.biblatex @@ -40,6 +40,6 @@ - year: 1961 title: Partial symmetries of weak interactions container-title: Nucl. Phys. - page: '579-588' + page: 579-588 volume: '22' ... diff --git a/tests/biblio2yaml/gonzalez.biblatex b/tests/biblio2yaml/gonzalez.biblatex --- a/tests/biblio2yaml/gonzalez.biblatex +++ b/tests/biblio2yaml/gonzalez.biblatex @@ -50,6 +50,6 @@ publisher-place: Tucson annote: A collection of short stories. This is a book entry. Note the sorttitle and indextitle fields in the database file. There’s also an isbn field - ISBN: '0-816-52066-6' + ISBN: 0-816-52066-6 language: en-US ... diff --git a/tests/biblio2yaml/herrmann.biblatex b/tests/biblio2yaml/herrmann.biblatex --- a/tests/biblio2yaml/herrmann.biblatex +++ b/tests/biblio2yaml/herrmann.biblatex @@ -57,7 +57,7 @@ - year: 2006 title: A carbocyclic carbene as an efficient catalyst ligand for C–C coupling reactions container-title: Angew. Chem. Int. Ed. - page: '3859-3862' + page: 3859-3862 volume: '45' issue: '23' ... diff --git a/tests/biblio2yaml/hyman.biblatex b/tests/biblio2yaml/hyman.biblatex --- a/tests/biblio2yaml/hyman.biblatex +++ b/tests/biblio2yaml/hyman.biblatex @@ -65,7 +65,7 @@ collection-number: '9' publisher: The Catholic University of America Press publisher-place: Washington, D.C. - page: '161-191' + page: 161-191 annote: An incollection entry with a series and number field keyword: secondary language: en-US diff --git a/tests/biblio2yaml/inbook.biblatex b/tests/biblio2yaml/inbook.biblatex --- a/tests/biblio2yaml/inbook.biblatex +++ b/tests/biblio2yaml/inbook.biblatex @@ -77,7 +77,7 @@ volume-title: Kritik der praktischen Vernunft. Kritik der Urtheilskraft publisher: Walter de Gruyter publisher-place: Berlin - page: '1-163' + page: 1-163 volume: '5' annote: An edition of Kant’s *Collected Works*, volume five. This is an inbook entry which explicitly refers to the *Critique of Practical Reason* only, not to the @@ -101,7 +101,7 @@ volume-title: Kritik der praktischen Vernunft. Kritik der Urtheilskraft publisher: Walter de Gruyter publisher-place: Berlin - page: '165-485' + page: 165-485 volume: '5' annote: An edition of Kant’s *Collected Works*, volume five. This is an inbook entry which explicitly refers to the *Critique of Judgment* only, not to the entire @@ -131,7 +131,7 @@ Schriften 1870–1973 publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter publisher-place: München; Berlin; New York - page: '243-334' + page: 243-334 volume: '1' annote: A single essay from the critical edition of Nietzsche’s works. This inbook entry explicitly refers to an essay found in the first volume. Note the title, diff --git a/tests/biblio2yaml/incollection-2.biblatex b/tests/biblio2yaml/incollection-2.biblatex --- a/tests/biblio2yaml/incollection-2.biblatex +++ b/tests/biblio2yaml/incollection-2.biblatex @@ -55,7 +55,7 @@ container-title: 'Space and beyond: The frontier theme in science fiction' publisher: Greenwood publisher-place: Westport, Conn.; London - page: '55-65' + page: 55-65 annote: A cross-referenced article from a collection. This is an incollection entry with a crossref field. Note the subtitle and indextitle fields language: en-US @@ -74,8 +74,8 @@ container-title: Alternative modernities publisher: Duke University Press publisher-place: Durham; London - page: '1-23' - ISBN: '0-822-32714-7' + page: 1-23 + ISBN: 0-822-32714-7 - id: westfahl:frontier type: book diff --git a/tests/biblio2yaml/incollection.biblatex b/tests/biblio2yaml/incollection.biblatex --- a/tests/biblio2yaml/incollection.biblatex +++ b/tests/biblio2yaml/incollection.biblatex @@ -74,7 +74,7 @@ collection-number: '2' publisher: Klett-Cotta publisher-place: Stuttgart - page: '884-917' + page: 884-917 annote: An incollection entry with a series and a number. Note the format of the printed name and compare the useprefix option in the options field as well as vangennep. Also note the indextitle, and indexsorttitle fields @@ -97,7 +97,7 @@ collection-number: '9' publisher: The Catholic University of America Press publisher-place: Washington, D.C. - page: '161-191' + page: 161-191 annote: An incollection entry with a series and number field keyword: secondary language: en-US @@ -118,7 +118,7 @@ container-title: Studies in medieval Jewish history and literature publisher: Harvard University Press publisher-place: Cambridge, Mass. - page: '82-109' + page: 82-109 annote: A typical incollection entry. Note the indextitle field keyword: secondary language: en-US diff --git a/tests/biblio2yaml/inproceedings.biblatex b/tests/biblio2yaml/inproceedings.biblatex --- a/tests/biblio2yaml/inproceedings.biblatex +++ b/tests/biblio2yaml/inproceedings.biblatex @@ -57,7 +57,7 @@ Aristotelicum publisher: Cambridge University Press publisher-place: Cambridge - page: '281-324' + page: 281-324 annote: This is a typical inproceedings entry. Note the booksubtitle, shorttitle, indextitle, and indexsorttitle fields. Also note the eventdate field. keyword: secondary @@ -86,5 +86,5 @@ publisher: Almquist & Wiksell publisher-place: Stockholm event-place: Aspenäsgarden, Lerum - page: '367-377' + page: 367-377 ... diff --git a/tests/biblio2yaml/jcg.biblatex b/tests/biblio2yaml/jcg.biblatex --- a/tests/biblio2yaml/jcg.biblatex +++ b/tests/biblio2yaml/jcg.biblatex @@ -44,5 +44,5 @@ volume: '35' issue: '4' annote: This is a periodical entry with an issn field. - ISSN: '0097-8493' + ISSN: 0097-8493 ... diff --git a/tests/biblio2yaml/kant-kpv.biblatex b/tests/biblio2yaml/kant-kpv.biblatex --- a/tests/biblio2yaml/kant-kpv.biblatex +++ b/tests/biblio2yaml/kant-kpv.biblatex @@ -71,7 +71,7 @@ volume-title: Kritik der praktischen Vernunft. Kritik der Urtheilskraft publisher: Walter de Gruyter publisher-place: Berlin - page: '1-163' + page: 1-163 volume: '5' annote: An edition of Kant’s *Collected Works*, volume five. This is an inbook entry which explicitly refers to the *Critique of Practical Reason* only, not to the diff --git a/tests/biblio2yaml/kant-ku.biblatex b/tests/biblio2yaml/kant-ku.biblatex --- a/tests/biblio2yaml/kant-ku.biblatex +++ b/tests/biblio2yaml/kant-ku.biblatex @@ -66,7 +66,7 @@ volume-title: Kritik der praktischen Vernunft. Kritik der Urtheilskraft publisher: Walter de Gruyter publisher-place: Berlin - page: '165-485' + page: 165-485 volume: '5' annote: An edition of Kant’s *Collected Works*, volume five. This is an inbook entry which explicitly refers to the *Critique of Judgment* only, not to the entire diff --git a/tests/biblio2yaml/manual.biblatex b/tests/biblio2yaml/manual.biblatex --- a/tests/biblio2yaml/manual.biblatex +++ b/tests/biblio2yaml/manual.biblatex @@ -38,7 +38,7 @@ in the database file which is provided for author-year citation styles. Also note the sorttitle and indextitle fields. By default, all entries without an author or editor are alphabetized by title but we want this entry to be alphabetized - under “C” rather than “T”. There’s also an isbn field - ISBN: '0-226-10403-6' + under ‘C’ rather than ‘T’. There’s also an isbn field + ISBN: 0-226-10403-6 language: en-US ... diff --git a/tests/biblio2yaml/moore-related.biblatex b/tests/biblio2yaml/moore-related.biblatex --- a/tests/biblio2yaml/moore-related.biblatex +++ b/tests/biblio2yaml/moore-related.biblatex @@ -51,7 +51,7 @@ - year: 1998 title: Cramming more components onto integrated circuits container-title: Proceedings of the IEEE - page: '82-85' + page: 82-85 volume: '86' issue: '1' annote: A reprint of Moore’s law. Note the related and relatedtype fields diff --git a/tests/biblio2yaml/moore.biblatex b/tests/biblio2yaml/moore.biblatex --- a/tests/biblio2yaml/moore.biblatex +++ b/tests/biblio2yaml/moore.biblatex @@ -43,7 +43,7 @@ - year: 1965 title: Cramming more components onto integrated circuits container-title: Electronics - page: '114-117' + page: 114-117 volume: '38' issue: '8' language: en-US diff --git a/tests/biblio2yaml/moraux.biblatex b/tests/biblio2yaml/moraux.biblatex --- a/tests/biblio2yaml/moraux.biblatex +++ b/tests/biblio2yaml/moraux.biblatex @@ -80,7 +80,7 @@ Aristotelicum publisher: Cambridge University Press publisher-place: Cambridge - page: '281-324' + page: 281-324 annote: This is a typical inproceedings entry. Note the booksubtitle, shorttitle, indextitle, and indexsorttitle fields. Also note the eventdate field. keyword: secondary diff --git a/tests/biblio2yaml/murray.biblatex b/tests/biblio2yaml/murray.biblatex --- a/tests/biblio2yaml/murray.biblatex +++ b/tests/biblio2yaml/murray.biblatex @@ -89,7 +89,7 @@ of core size' title-short: Alkanethiolate gold cluster molecules container-title: Langmuir - page: '17-30' + page: 17-30 volume: '14' issue: '1' annote: An article entry with author authors. By default, long author and editor diff --git a/tests/biblio2yaml/nietzsche-historie.biblatex b/tests/biblio2yaml/nietzsche-historie.biblatex --- a/tests/biblio2yaml/nietzsche-historie.biblatex +++ b/tests/biblio2yaml/nietzsche-historie.biblatex @@ -83,7 +83,7 @@ Schriften 1870–1973 publisher: Deutscher Taschenbuch-Verlag; Walter de Gruyter publisher-place: München; Berlin; New York - page: '243-334' + page: 243-334 volume: '1' annote: A single essay from the critical edition of Nietzsche’s works. This inbook entry explicitly refers to an essay found in the first volume. Note the title, diff --git a/tests/biblio2yaml/padhye.biblatex b/tests/biblio2yaml/padhye.biblatex --- a/tests/biblio2yaml/padhye.biblatex +++ b/tests/biblio2yaml/padhye.biblatex @@ -101,6 +101,6 @@ build upon the previous analysis to provide both an approximate formula as well as a more accurate stochastic model for the steady state throughput of a bulk transfer TCP flow. - number: '99-02' + number: 99-02 language: en-US ... diff --git a/tests/biblio2yaml/pandoc-2/sigfridsson.biblatex b/tests/biblio2yaml/pandoc-2/sigfridsson.biblatex --- a/tests/biblio2yaml/pandoc-2/sigfridsson.biblatex +++ b/tests/biblio2yaml/pandoc-2/sigfridsson.biblatex @@ -76,7 +76,7 @@ title: Comparison of methods for deriving atomic charges from the electrostatic potential and moments container-title: Journal of Computational Chemistry - page: '377-395' + page: 377-395 volume: '19' issue: '4' annote: An article entry with volume, number, and doi fields. Note that the