Accomodate jog and attrcheck to pandoc dev version

Author: tarleb

src/resources/filters/modules/attribcheck.lua

@@ -141,10 +141,20 @@ local function warn_conversion (expected, actual, shift, extrainfo)
     dbginfostr = (dbginfo.name or '<no name>') .. ' in ' .. dbginfo.source
       .. ':' .. dbginfo.currentline
   end
-  error(actual .. ' instead of ' .. expected .. ': ' .. dbginfostr
+  warn(actual .. ' instead of ' .. expected .. ': ' .. dbginfostr
        .. (extrainfo and '\n' .. extrainfo or ''))
 end
 
+local makeCaption = pandoc.Caption
+if not makeCaption then
+  makeCaption = function (long, short)
+    return {
+      long = long,
+      short = short
+    }
+  end
+end
+
 local ensure_type
 ensure_type = {
   Attr = function (obj)
@@ -160,42 +170,49 @@ ensure_type = {
     if pt == 'Blocks' then
       return obj
     elseif pt == 'List' or pt == 'table' then
-      warn_conversion('Blocks', pt, shift, extrainfo)
+      warn_conversion('Blocks', pt, shift, tostring(obj))
       return setmetatable(obj, BlocksMT)
     elseif pt == 'Inline' then
-      warn_conversion('Blocks', pt, shift)
+      warn_conversion('Blocks', pt, shift, tostring(obj))
       return setmetatable({pandoc.Plain{obj}}, BlocksMT)
     elseif pt == 'Inlines' then
-      warn_conversion('Blocks', pt, shift)
+      warn_conversion('Blocks', pt, shift, tostring(obj))
       return setmetatable({pandoc.Plain(obj)}, BlocksMT)
     else
-      warn_conversion('Blocks', pt, shift)
+      warn_conversion('Blocks', pt, shift, tostring(obj))
       return pandoc.Blocks(obj)
     end
   end,
 
-  Caption = function (obj, shift)
+  Caption = function (obj, shift, extrainfo)
     local tp = ptype(obj)
-    if tp == 'table' and obj.long then
-      obj.long = ensure_type['Blocks'](obj.long, shift + 1)
+    if tp == 'Caption' then
+      return obj
+    elseif tp == 'table' and obj.long then
+      if pandoc.Caption then warn_conversion('Caption', tp) end
+      local long = ensure_type['Blocks'](obj.long, shift + 1, extrainfo)
+      local short
       if obj.short then
-        obj.short = ensure_type['Inlines'](obj.short, shift + 1)
+        short = ensure_type['Inlines'](obj.short, shift + 1, extrainfo)
       end
-      return obj
+      return makeCaption(long, short)
     else
-      warn_conversion('Caption', tp)
-      local blocks = ensure_type['Blocks'](obj)
-      for i = 1, #obj do
-        obj[i] = nil
+      if pandoc.Caption then warn_conversion('Caption', tp) end
+      local blocks = ensure_type['Blocks'](obj, shift + 1, extrainfo)
+      if pandoc.Caption then
+        return pandoc.Caption(blocks)
+      else
+        for i = 1, #obj do
+          obj[i] = nil
+        end
+        obj.long = blocks
+        return obj
       end
-      obj.long = blocks
-      return obj
     end
   end,
 
   DefinitionItem = function (obj, shift)
     shift = shift or 0
-    -- warn_conversion('DefinitionItem', type(obj))
     obj[1] = ensure_type['Inlines'](obj[1], shift + 1)
     obj[2] = ensure_type[{ sequence = 'Blocks'}](obj[2], shift + 1)
     return obj
@@ -279,15 +296,15 @@ ensure_type = {
 
   TableFoot = function (obj)
     local pt = ptype(obj)
-    if pt ~= 'pandoc TableFoot' then
+    if pt ~= 'pandoc TableFoot' and pt ~= 'TableFoot' then
       error('Cannot auto-convert to TableFoot, got ' .. pt)
     end
     return obj
   end,
 
   TableHead = function (obj)
     local pt = ptype(obj)
-    if pt ~= 'pandoc TableHead' then
+    if pt ~= 'pandoc TableHead' and pt ~= 'TableHead' then
       error('Cannot auto-convert to TableHead, got ' .. pt)
     end
     return obj
@@ -329,6 +346,7 @@ local ensure_type_metatable = {
 }
 setmetatable(ensure_type, ensure_type_metatable)
 
+local CaptionMT = pandoc.Caption and debug.getmetatable(pandoc.Caption{})
 local CellMT = debug.getmetatable(pandoc.Cell{})
 local InlineMT = debug.getmetatable(pandoc.Space())
 local BlockMT = debug.getmetatable(pandoc.HorizontalRule())
@@ -357,6 +375,18 @@ local function enable_attribute_checks()
     end
   end
 
+  -- Caption (currently only in pandoc dev version)
+  if CaptionMT then
+    CaptionMT.setters.short = function (obj, key, value)
+      if value ~= nil then
+        default_setter(obj, key, ensure_type['Inlines'](value))
+      end
+    end
+    CaptionMT.setters.long = function (obj, key, value)
+      default_setter(obj, key, ensure_type['Blocks'](value))
+    end
+  end
+
   -- Cell
   CellMT.setters.col_span = function (obj, key, value)
     default_setter(obj, key, ensure_type['integer'](value))

src/resources/filters/modules/jog.lua

@@ -95,7 +95,8 @@ local function recurse (element, tp, jogger)
     for key, value in pairs(element) do
       element[key] = jogger(value)
     end
-  elseif content_only_node_tags[tag] or tp == 'pandoc Cell' then
+  elseif content_only_node_tags[tag] or
+         tp == 'Cell' or tp == 'pandoc Cell' then
     element.content = jogger(element.content)
   elseif tag == 'Image' then
     element.caption = jogger(element.caption)
@@ -104,16 +105,20 @@ local function recurse (element, tp, jogger)
     element.head    = jogger(element.head)
     element.bodies  = jogger(element.bodies)
     element.foot    = jogger(element.foot)
+  elseif tag == 'Caption' then
+    element.long = jogger(element.long)
+    element.short = element.short and jogger(element.short)
   elseif tag == 'Figure' then
     element.caption = jogger(element.caption)
     element.content = jogger(element.content)
   elseif tp == 'Meta' then
     for key, value in pairs(element) do
       element[key] = jogger(value)
     end
-  elseif tp == 'pandoc Row' then
+  elseif tp == 'Row' or tp == 'pandoc Row' then
     element.cells    = jogger(element.cells)
-  elseif tp == 'pandoc TableHead' or tp == 'pandoc TableFoot' then
+  elseif tp == 'pandoc TableHead' or tp == 'pandoc TableFoot' or
+         tp == 'TableHead' or tp == 'TableFoot' then
     element.rows    = jogger(element.rows)
   elseif tp == 'Blocks' or tp == 'Inlines' then
     local expected_itemtype = tp == 'Inlines' and 'Inline' or 'Block'
@@ -160,6 +165,9 @@ local function recurse (element, tp, jogger)
       element[i] = jogger(item)
       i, item = i+1, element[i+1]
     end
+  elseif tp == 'Caption' then
+    element.long = jogger(element.long)
+    element.short = element.short and jogger(element.short)
   elseif tp == 'Pandoc' then
     element.meta = jogger(element.meta)
     element.blocks = jogger(element.blocks)
@@ -276,15 +284,16 @@ local function add_method(funname)
   pandoc.Pandoc{}         -- init metatable 'Pandoc'
   pandoc.Blocks{}         -- init metatable 'Blocks'
   pandoc.Inlines{}        -- init metatable 'Inlines'
-  pandoc.Cell{}           -- init metatable 'pandoc Cell'
-  pandoc.Row{}            -- init metatable 'pandoc Row'
-  pandoc.TableHead{}      -- init metatable 'pandoc TableHead'
-  pandoc.TableFoot{}      -- init metatable 'pandoc TableFoot'
+  pandoc.Caption{}        -- init metatable 'Caption'
+  pandoc.Cell{}           -- init metatable 'Cell'
+  pandoc.Row{}            -- init metatable 'Row'
+  pandoc.TableHead{}      -- init metatable 'TableHead'
+  pandoc.TableFoot{}      -- init metatable 'TableFoot'
   local reg = debug.getregistry()
   List{
     'Block', 'Inline', 'Pandoc',
     'pandoc Cell', 'pandoc Row', 'pandoc TableHead', 'pandoc TableFoot',
-    'Cell', 'Row', 'TableHead', 'TableFoot',
+    'Caption', 'Cell', 'Row', 'TableHead', 'TableFoot',
   }:map(
     function (name)
       if reg[name] then