Store traversal function in _quarto.traverser

Author: tarleb

src/resources/filters/ast/customnodes.lua

@@ -73,7 +73,8 @@ function run_emulated_filter(doc, filter)
         -- luacov: enable
       end
     end
-    return node:walk(filter_param)
+    local result = node:walk(filter_param)
+    return result
   end
 
   -- performance: if filter is empty, do nothing

src/resources/filters/common/layout.lua

@@ -56,7 +56,7 @@ end
 -- we often wrap a table in a div, unwrap it
 function tableFromLayoutCell(cell)
   local tbl
-  cell:walk({
+  _quarto.traverser(cell, {
     Table = function(t)
       tbl = t
     end
@@ -106,4 +106,4 @@ function asLatexSize(size, macro)
   else
     return size
   end
-end
+end

src/resources/filters/common/pandoc.lua

@@ -216,14 +216,14 @@ function string_to_quarto_ast_blocks(text, opts)
 
   -- run the whole normalization pipeline here to get extended AST nodes, etc.
   for _, filter in ipairs(quarto_ast_pipeline()) do
-    doc = doc:walk(filter.filter)
+    doc = _quarto.traverser(doc, filter.filter)
   end
 
   -- compute flags so we don't skip filters that depend on them
-  doc:walk(compute_flags())
+  _quarto.traverser(doc, compute_flags())
   return doc.blocks
 end
 
 function string_to_quarto_ast_inlines(text, sep)
   return pandoc.utils.blocks_to_inlines(string_to_quarto_ast_blocks(text), sep)
-end
+end

src/resources/filters/common/wrapped-filter.lua

@@ -97,7 +97,7 @@ function makeWrappedJsonFilter(scriptFile, filterHandler)
         path = quarto.utils.resolve_path_relative_to_document(scriptFile)
         local custom_node_map = {}
         local has_custom_nodes = false
-        doc = doc:walk({
+        doc = _quarto.traverser(doc, {
           -- FIXME: This is broken with new AST. Needs to go through Custom node instead.
           RawInline = function(raw)
             local custom_node, t, kind = _quarto.ast.resolve_custom_data(raw)
@@ -130,7 +130,7 @@ function makeWrappedJsonFilter(scriptFile, filterHandler)
           return nil
         end
         if has_custom_nodes then
-          doc:walk({
+          _quarto.traverser(doc, {
             Meta = function(meta)
               _quarto.ast.reset_custom_tbl(meta["quarto-custom-nodes"])
             end
@@ -250,4 +250,4 @@ function filterSeq(filters)
       return result
     end
   }
-end
+end

src/resources/filters/quarto-post/book.lua

@@ -8,10 +8,11 @@ local license = require 'modules/license'
 local function clean (inlines)
   -- this is in post, so it's after render, so we don't need to worry about
   -- custom ast nodes
-  return inlines:walk {
-    Note = function (_) return {} end,
+  return _quarto.traverser(inlines, {
+    traverse = 'topdown',
+    Note = function (_) return {}, false end,
     Link = function (link) return link.content end,
-  }
+  })
 end
 
 --- Creates an Inlines singleton containing the raw LaTeX.

src/resources/filters/quarto-post/delink.lua

@@ -19,7 +19,7 @@ function delink()
         -- find links and transform them to spans
         -- this is in post, so it's after render, so we don't need to worry about
         -- custom ast nodes
-        return pandoc.walk_block(div, {
+        return _quarto.traverser(div, {
           Link = function(link)
             return pandoc.Span(link.content)
           end

src/resources/filters/quarto-post/latex.lua

@@ -407,7 +407,7 @@ function render_latex()
         end,
         Note = function(el)
           tappend(noteContents, {el.content})
-          el.content:walk({
+          _quarto.traverser(el.content, {
             CodeBlock = function(el)
               hasVerbatimInNotes = true
             end
@@ -570,19 +570,7 @@ function render_latex_fixups()
       return emit_color("{rgb}{0,0,0}")
     end
   end
-  return {
-    Meta = function(meta)
-      if not need_inject then
-        return
-      end
-      metaInjectLatex(meta, function(inject)
-        for v, i in pairs(emitted_colors) do
-          local def = "\\definecolor{QuartoInternalColor" .. i .. "}" .. v
-          inject(def)
-        end
-      end)
-      return meta
-    end,
+  return {{
     RawBlock = function(raw)
       if _quarto.format.isRawLatex(raw) then
         local long_table_match = _quarto.modules.patterns.match_all_in_table(_quarto.patterns.latexLongtablePattern)
@@ -615,5 +603,18 @@ function render_latex_fixups()
         return pandoc.RawBlock('latex', table.concat(new_lines, "\n"))
       end
     end
-  }
+  }, {
+    Meta = function(meta)
+      if not need_inject then
+        return
+      end
+      metaInjectLatex(meta, function(inject)
+        for v, i in pairs(emitted_colors) do
+          local def = "\\definecolor{QuartoInternalColor" .. i .. "}" .. v
+          inject(def)
+        end
+      end)
+      return meta
+    end,
+  }}
 end

src/resources/filters/quarto-pre/shiny.lua

@@ -67,7 +67,7 @@ function server_shiny()
       -- blocks.)
       local context = nil
 
-      local res = pandoc.walk_block(divEl, {
+      local res = _quarto.traverser(divEl, {
         CodeBlock = function(el)
           if el.attr.classes:includes("python") and el.attr.classes:includes("cell-code") then
 

src/resources/pandoc/datadir/_utils.lua

@@ -599,6 +599,14 @@ local function is_empty_node (node)
   end
 end
 
+--- Call the node's walk method with the given filters.
+-- @param node    a pandoc AST node
+-- @param filter  table with filter functions
+local function walk(node, filter)
+  quarto_assert(node and node.walk)
+  return node:walk(filter)
+end
+
 return {
   dump = dump,
   type = get_type,
@@ -611,6 +619,7 @@ return {
   as_blocks = as_blocks,
   is_empty_node = is_empty_node,
   match = match,
+  walk = walk,
   add_to_blocks = function(blocks, block)
     if pandoc.utils.type(blocks) ~= "Blocks" then
       fatal("add_to_blocks: invalid type " .. pandoc.utils.type(blocks))

src/resources/pandoc/datadir/init.lua

@@ -1882,6 +1882,7 @@ _quarto = {
       latexTablePatterns = latexTablePatterns,
       latexCaptionPattern = latexCaptionPattern_table
    },
+   traverser = utils.walk,
    utils = utils,
    withScriptFile = function(file, callback)
       table.insert(scriptFile, file)