multiple-bibliographies: use citeproc in pandoc for newer version

Author: tarleb

multiple-bibliographies/expected.native

@@ -1,14 +1,14 @@
-Pandoc (Meta {unMeta = fromList [("bibliography_recommended_reading",MetaInlines [Str "secondary.bib"]),("bibliography_sources",MetaInlines [Str "primary.bib"]),("nocite",MetaInlines [Cite [Citation {citationId = "Knu86", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@Knu86"],Str ",",Space,Cite [Citation {citationId = "Bae", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 0}] [Str "@Bae"]]),("title",MetaInlines [Str "Multiple",Space,Str "Bibliographies",Space,Str "Demo"])]})
-[Para [Cite [Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 1}] [Str "Nietzsche",Space,Str "(1872)"],Str ",",Space,Cite [Citation {citationId = "Bel", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 0, citationHash = 2}] [Str "Bellori",Space,Str "(1672)"]]
+Pandoc (Meta {unMeta = fromList [("bibliography_recommended_reading",MetaInlines [Str "secondary.bib"]),("bibliography_sources",MetaInlines [Str "primary.bib"]),("nocite",MetaInlines [Cite [Citation {citationId = "Knu86", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 1, citationHash = 0}] [Str "@Knu86"],Str ",",Space,Cite [Citation {citationId = "Bae", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 2, citationHash = 0}] [Str "@Bae"]]),("title",MetaInlines [Str "Multiple",Space,Str "Bibliographies",Space,Str "Demo"])]})
+[Para [Cite [Citation {citationId = "Nie72", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 3, citationHash = 0}] [Str "Nietzsche",Space,Str "(1872)"],Str ",",Space,Cite [Citation {citationId = "Bel", citationPrefix = [], citationSuffix = [], citationMode = AuthorInText, citationNoteNum = 4, citationHash = 0}] [Str "Bellori",Space,Str "(1672)"]]
 ,Header 1 ("references",[],[]) [Str "References"]
 ,Div ("refs_sources",[],[])
- [Div ("ref-Bel",[],[])
-  [Para [Str "Bellori.",Space,Str "1672.",Space,Emph [Str "Le",Space,Str "Vite",Space,Str "de\8217",Space,Str "Pittori,",Space,Str "Scultori",Space,Str "E",Space,Str "Architetti",Space,Str "Moderni"],Str "."]]
- ,Div ("ref-Nie72",[],[])
+ [Div ("ref-Bel",["csl-entry"],[])
+  [Para [Str "Bellori.",Space,Str "1672.",Space,Emph [Str "Le",Space,Str "Vite",Space,Str "de\8217",Space,Str "Pittori,",Space,Str "Scultori",Space,Str "e",Space,Str "Architetti",Space,Str "Moderni"],Str "."]]
+ ,Div ("ref-Nie72",["csl-entry"],[])
   [Para [Str "Nietzsche,",Space,Str "Friedrich.",Space,Str "1872.",Space,Emph [Str "Die",Space,Str "Geburt",Space,Str "Der",Space,Str "Trag\246die",Space,Str "Aus",Space,Str "Dem",Space,Str "Geiste",Space,Str "Der",Space,Str "Musik"],Str "."]]]
 ,Header 1 ("recommended-reading",[],[]) [Str "Recommended",Space,Str "Reading"]
 ,Div ("refs_recommended_reading",[],[])
- [Div ("ref-Bae",[],[])
+ [Div ("ref-Bae",["csl-entry"],[])
   [Para [Str "B\228tschmann,",Space,Str "Oskar.",Space,Str "1985.",Space,Emph [Str "Pygmalion",Space,Str "Als",Space,Str "Betrachter"],Str "."]]
- ,Div ("ref-Knu86",[],[])
-  [Para [Str "Knuth,",Space,Str "Donald",Space,Str "E.",Space,Str "1986.",Space,Emph [Str "The",Space,Str "Texbook"],Str "."]]]]
+ ,Div ("ref-Knu86",["csl-entry"],[])
+  [Para [Str "Knuth,",Space,Str "Donald",Space,Str "E.",Space,Str "1986.",Space,Emph [Str "The",Space,Str "TeXbook"],Str "."]]]]

multiple-bibliographies/multiple-bibliographies.lua

@@ -29,6 +29,10 @@ local doc_meta = pandoc.Meta{}
 local refs_div = pandoc.Div({}, pandoc.Attr('refs'))
 
 local supports_quiet_flag = (function ()
+  -- We use pandoc instead of pandoc-citeproc starting with pandoc 2.11
+  if PANDOC_VERSION >= "2.11" then
+    return true
+  end
   local version = pandoc.pipe('pandoc-citeproc', {'--version'}, '')
   local major, minor, patch = version:match 'pandoc%-citeproc (%d+)%.(%d+)%.?(%d*)'
   major, minor, patch = tonumber(major), tonumber(minor), tonumber(patch)
@@ -37,6 +41,24 @@ local supports_quiet_flag = (function ()
     or (minor == 14 and patch >= 5)
 end)()
 
+local function run_citeproc(doc, quiet)
+  if PANDOC_VERSION >= "2.11" then
+    return run_json_filter(
+      doc,
+      'pandoc',
+      {'--from=json', '--to=json', '--citeproc', quiet and '--quiet' or nil}
+    )
+  else
+    -- doc = run_json_filter(doc, 'pandoc-citeproc')
+    return run_json_filter(
+      doc,
+      'pandoc-citeproc',
+      {FORMAT, (quiet and supports_quiet_flag) and '-q' or nil}
+    )
+  end
+end
+
+
 --- Resolve citations in the document by combining all bibliographies
 -- before running pandoc-citeproc on the full document.
 local function resolve_doc_citations (doc)
@@ -52,7 +74,8 @@ local function resolve_doc_citations (doc)
   -- add dummy div to catch the created bibliography
   table.insert(doc.blocks, refs_div)
   -- resolve all citations
-  doc = run_json_filter(doc, 'pandoc-citeproc')
+  -- doc = run_json_filter(doc, 'pandoc-citeproc')
+  doc = run_citeproc(doc)
   -- remove catch-all bibliography
   table.remove(doc.blocks)
   -- restore bibliography to original value
@@ -91,8 +114,7 @@ local function create_topic_bibliography (div)
   local tmp_blocks = {pandoc.Para(all_cites), refs_div}
   local tmp_meta = meta_for_pandoc_citeproc(bibfile)
   local tmp_doc = pandoc.Pandoc(tmp_blocks, tmp_meta)
-  local filter_args = {FORMAT, supports_quiet_flag and '-q' or nil}
-  local res = run_json_filter(tmp_doc, 'pandoc-citeproc', filter_args)
+  local res = run_citeproc(tmp_doc, true) -- try to be quiet
   -- First block of the result contains the dummy paragraph, second is
   -- the refs Div filled by pandoc-citeproc.
   div.content = res.blocks[2].content