Merge branch 'pandoc:master' into master

Author: chrisaga

.github/CODEOWNERS

@@ -0,0 +1,32 @@
+# Default
+* @tarleb @jgm
+
+include-files/* @tarleb
+revealjs-codeblock/*
+latex-hyphen/* @frederik-elwert
+lilypond/* @cole-miller
+scholarly-metadata/* @tarleb
+list-table/*
+scrlttr2/* @tarleb
+abstract-to-meta/* @tarleb
+lua-debug-example/*
+section-refs/*
+author-info-blocks/* @tarleb
+math2svg/*
+short-captions/*
+bibexport/* @tarleb
+mhchem/* @jgm
+spellcheck/*
+cito/* @tarleb
+minted/*
+table-short-captions/*
+diagram-generator/*
+multiple-bibliographies/* @tarleb
+track-changes/* @tolot27
+doi2cite/*
+not-in-format/*
+wordcount/* @jgm
+first-line-indent/*
+pagebreak/* @tarleb
+include-code-files/*
+pandoc-quotes.lua/* @odkr

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ on:
       - CONTRIBUTING.md
       - LICENSE
       - .editorconfig
+      - '.github/CODEOWNERS'
   push:
     branches:
       - master
@@ -17,6 +18,7 @@ on:
       - CONTRIBUTING.md
       - LICENSE
       - .editorconfig
+      - '.github/CODEOWNERS'
   schedule:
     # At 4:17am each Monday
     - cron: '17 4 * * 1'

bibexport/bibexport.lua

@@ -3,6 +3,8 @@ local List = require 'pandoc.List'
 
 local citation_id_set = {}
 
+local type = utils.type or type
+
 -- Collect all citation IDs.
 function Cite (c)
   local cs = c.citations
@@ -37,7 +39,7 @@ function bibdata (bibliography)
       or stringifyMetaInlines(bibitem):gsub('%.bib$', '')
   end
 
-  local bibs = bibliography.t == 'MetaList'
+  local bibs = (type(bibliography) == 'List' or bibliography.t == 'MetaList')
     and List.map(bibliography, bibname)
     or {bibname(bibliography)}
   return table.concat(bibs, ',')
@@ -62,7 +64,7 @@ function write_dummy_aux (bibliography, auxfile)
   local filename
   if type(auxfile) == 'string' then
     filename = auxfile
-  elseif type(auxfile) == 'table' then
+  elseif type(auxfile) == 'table' or type(auxfile) == 'Inlines' then
     -- assume list of inlines
     filename = utils.stringify(pandoc.Span(auxfile))
   else

first-line-indent/Makefile

@@ -5,11 +5,11 @@ PANDOC ?= pandoc
 
 test: test_latex test_html
 
-test_html: sample.md expected.html first-line-indent.lua
+test_html: sample.md first-line-indent.lua
 	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=html $< \
 		| $(DIFF) expected.html -
 
-test_latex: sample.md expected.tex first-line-indent.lua
+test_latex: sample.md first-line-indent.lua
 	@$(PANDOC) -s --lua-filter first-line-indent.lua --to=latex $< \
 		| $(DIFF) expected.tex -
 

first-line-indent/first-line-indent.lua

@@ -75,6 +75,17 @@ local header_code = {
 ]],
 }
 
+--- Returns the type of a metadata value.
+--
+-- @param v a metadata value
+-- @return string one of Blocks, Inlines, List, table, string, or boolean.
+local type = PANDOC_VERSION > '2.16.2'
+  and utils.type
+  or function (v)
+    local metatag = type(v) == 'table' and v.t and v.t:gsub('^Meta', '')
+    return metatag and metatag ~= 'Map' and metatag or type(v)
+  end
+
 --- Add a block to the document's header-includes meta-data field.
 -- @param meta the document's metadata block
 -- @param blocks list of Pandoc block elements (e.g. RawBlock or Para)
@@ -87,7 +98,7 @@ local function add_header_includes(meta, blocks)
   -- add any exisiting meta['header-includes']
   -- it could be a MetaList or a single String
   if meta['header-includes'] then
-    if meta['header-includes'].t == 'MetaList' then
+    if type(meta['header-includes']) == 'List' then
       header_includes:extend(meta['header-includes'])
     else
       header_includes:insert(meta['header-includes'])
@@ -132,10 +143,10 @@ function process_metadata(meta)
 
     if (user_options['remove-after']) then
 
-      if user_options['remove-after'].t == 'MetaInlines' or
-        user_options['remove-after'].t == 'MetaList' then
+      if type(user_options['remove-after']) == 'Inlines' or
+        type(user_options['remove-after']) == 'List' then
 
-          if user_options['remove-after'].t == 'MetaInlines' then
+          if type(user_options['remove-after']) == 'Inlines' then
 
             options.remove_indent_after:insert (
               utils.stringify(user_options['remove-after']))
@@ -155,13 +166,13 @@ function process_metadata(meta)
 
     if (user_options['dont-remove-after']) then
 
-      if user_options['dont-remove-after'].t == 'MetaInlines' or
-        user_options['dont-remove-after'].t == 'MetaList' then
+      if type(user_options['dont-remove-after']) == 'Inlines' or
+        type(user_options['dont-remove-after']) == 'List' then
 
           -- list of strings to be removed
           local blacklist = pandoc.List({})
 
-          if user_options['dont-remove-after'].t == 'MetaInlines' then
+          if type(user_options['dont-remove-after']) == 'Inlines' then
 
             blacklist:insert (
               utils.stringify(user_options['dont-remove-after']))

include-files/include-files.lua

@@ -87,7 +87,12 @@ function transclude (cb)
       if not fh then
         io.stderr:write("Cannot open file " .. line .. " | Skipping includes\n")
       else
-        local contents = pandoc.read(fh:read '*a', format).blocks
+        -- read file as the given format with global reader options
+        local contents = pandoc.read(
+          fh:read '*a',
+          format,
+          PANDOC_READER_OPTIONS
+        ).blocks
         last_heading_level = 0
         -- recursive transclusion
         contents = system.with_working_directory(

list-table/Makefile

@@ -0,0 +1,11 @@
+DIFF ?= diff --strip-trailing-cr -u
+PANDOC ?= pandoc
+CMD = $(PANDOC) --lua-filter list-table.lua --to=html sample.md
+
+test:
+	@$(CMD) | $(DIFF) expected.html -
+
+update:
+	$(CMD) > expected.html
+
+.PHONY: test update