Force use of pandoc walk for some filters

Author: tarleb

src/resources/filters/ast/customnodes.lua

@@ -41,7 +41,7 @@ function is_regular_node(node, name)
   return node
 end
 
-function run_emulated_filter(doc, filter)
+function run_emulated_filter(doc, filter, force_use_walk)
   if doc == nil then
     return nil
   end
@@ -73,7 +73,10 @@ function run_emulated_filter(doc, filter)
         -- luacov: enable
       end
     end
-    return _quarto.modules.jog(node, filter_param)
+    _QUARTO_USE_WALK = force_use_walk
+    local result = _quarto.modules.jog(node, filter_param)
+    _QUARTO_USE_WALK = false
+    return result
   end
 
   -- performance: if filter is empty, do nothing

src/resources/filters/ast/emulatedfilter.lua

@@ -68,6 +68,9 @@ inject_user_filters_at_entry_points = function(filter_list)
     end
     local filter = {
       name = entry_point .. "-user-" .. tostring(entry_point_counts[entry_point]),
+      -- The filter might not work as expected when doing a non-lazy jog, so
+      -- make sure it is processed with the default 'walk' function.
+      force_pandoc_walk = true,
     }
     if is_many_filters then
       filter.filters = wrapped

src/resources/filters/ast/runemulation.lua

@@ -79,7 +79,9 @@ local function run_emulated_filter_chain(doc, filters, afterFilterPass, profilin
         print(pandoc.write(doc, "native"))
       else
         _quarto.ast._current_doc = doc
-        doc = run_emulated_filter(doc, v.filter)
+
+        doc = run_emulated_filter(doc, v.filter, v.force_pandoc_walk)
+
         ensure_vault(doc)
 
         add_trace(doc, v.name)
@@ -204,4 +206,4 @@ function run_as_extended_ast(specTable)
   end
 
   return pandocFilterList
-end
+end

src/resources/filters/main.lua

@@ -374,7 +374,7 @@ local quarto_post_filters = {
   { name = "post-ojs", filter = ojs() },
 
   { name = "post-render-pandoc3-figure", filter = render_pandoc3_figure(),
-    flags = { "has_pandoc3_figure" } },
+    flags = { "has_pandoc3_figure" }, force_pandoc_walk = true },
 
   -- extensible rendering
   { name = "post-render_extended_nodes", filter = render_extended_nodes() },
@@ -425,6 +425,10 @@ local quarto_layout_filters = {
   { name = "layout-panels", filter = layout_panels() },
   { name = "post-fold-code-and-lift-codeblocks-from-floats", filter = fold_code_and_lift_codeblocks() },
 }
+quarto_layout_filters = pandoc.List.map(quarto_layout_filters, function (f)
+  f.force_pandoc_walk = true
+  return f
+end)
 
 local quarto_crossref_filters = {
 
@@ -435,7 +439,8 @@ local quarto_crossref_filters = {
     filter = crossref_preprocess_theorems(),
     flags = { "has_theorem_refs" } },
 
-  { name = "crossref-combineFilters", filter = combineFilters({
+  { name = "crossref-combineFilters", force_pandoc_walk = true,
+    filter = combineFilters({
     file_metadata(),
     qmd(),
     sections(),

src/resources/filters/modules/jog.lua

@@ -255,6 +255,10 @@ local function jog(element, filter)
     end
   end
 
+  if _QUARTO_USE_WALK then
+    return element:walk(filter)
+  end
+
   -- Create and call traversal function
   local jog_internal = make_jogger(filter, context)
   return jog_internal(element)

src/resources/filters/normalize/astpipeline.lua

@@ -35,7 +35,8 @@ function quarto_ast_pipeline()
         code_filename(),
         normalize_fixup_data_uri_image_extension(),
         warn_on_stray_triple_colons(),
-      })
+      }),
+      force_pandoc_walk = true,
     },
     { 
       name = "normalize-combine-2", 
@@ -44,6 +45,7 @@ function quarto_ast_pipeline()
         parse_floatreftargets(),
         parse_blockreftargets()
       }),
+      force_pandoc_walk = true,
     },
     {
       name = "normalize-3",