Skip to content

Commit 70181d5

Browse files
committed
Use jog for traversals in pre filters (except for flags)
1 parent 7ae726e commit 70181d5

File tree

1 file changed

+62
-25
lines changed

1 file changed

+62
-25
lines changed

src/resources/filters/main.lua

Lines changed: 62 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -259,56 +259,85 @@ tappend(quarto_normalize_filters, quarto_ast_pipeline())
259259

260260
local quarto_pre_filters = {
261261
-- quarto-pre
262-
{ name = "flags", filter = compute_flags() },
262+
{ name = "flags",
263+
filter = compute_flags()
264+
},
263265

264-
{ name = "pre-server-shiny", filter = server_shiny() },
266+
{ name = "pre-server-shiny",
267+
filter = server_shiny(),
268+
traverse = 'jog',
269+
},
265270

266271
-- https://github.com/quarto-dev/quarto-cli/issues/5031
267272
-- recompute options object in case user filters have changed meta
268273
-- this will need to change in the future; users will have to indicate
269274
-- when they mutate options
270-
{ name = "pre-read-options-again", filter = init_options() },
275+
{ name = "pre-read-options-again",
276+
filter = init_options(),
277+
traverse = 'jog',
278+
},
279+
280+
{ name = "pre-bibliography-formats",
281+
filter = bibliography_formats(),
282+
traverse = 'jog',
283+
},
271284

272-
{ name = "pre-bibliography-formats", filter = bibliography_formats() },
273-
274285
{ name = "pre-shortcodes-filter",
275286
filter = shortcodes_filter(),
276-
flags = { "has_shortcodes" } },
287+
flags = { "has_shortcodes" },
288+
traverse = 'jog',
289+
},
277290

278291
{ name = "pre-contents-shortcode-filter",
279292
filter = contents_shortcode_filter(),
280-
flags = { "has_contents_shortcode" } },
293+
flags = { "has_contents_shortcode" },
294+
traverse = 'jog',
295+
},
281296

282297
{ name = "pre-combined-hidden",
283298
filter = combineFilters({
284299
hidden(),
285300
content_hidden()
286301
}),
287-
flags = { "has_hidden", "has_conditional_content" } },
302+
flags = { "has_hidden", "has_conditional_content" },
303+
traverse = 'jog',
304+
},
288305

289-
{ name = "pre-table-captions",
306+
{ name = "pre-table-captions",
290307
filter = table_captions(),
291-
flags = { "has_table_captions" } },
292-
293-
{ name = "pre-code-annotations",
308+
flags = { "has_table_captions" },
309+
traverse = 'jog',
310+
},
311+
312+
{ name = "pre-code-annotations",
294313
filter = code_annotations(),
295-
flags = { "has_code_annotations" } },
296-
297-
{ name = "pre-code-annotations-meta", filter = code_meta() },
314+
flags = { "has_code_annotations" },
315+
traverse = 'jog',
316+
},
317+
318+
{ name = "pre-code-annotations-meta",
319+
filter = code_meta(),
320+
traverse = 'jog',
321+
},
298322

299-
{ name = "pre-unroll-cell-outputs",
323+
{ name = "pre-unroll-cell-outputs",
300324
filter = unroll_cell_outputs(),
301-
flags = { "needs_output_unrolling" } },
325+
flags = { "needs_output_unrolling" },
326+
traverse = 'jog',
327+
},
302328

303-
{ name = "pre-output-location",
304-
filter = output_location()
329+
{ name = "pre-output-location",
330+
filter = output_location(),
331+
traverse = 'jog',
305332
},
306333

307334
{ name = "pre-scope-resolution",
308-
filter = resolve_scoped_elements()
335+
filter = resolve_scoped_elements(),
336+
traverse = 'jog',
309337
},
310338

311-
{ name = "pre-combined-figures-theorems-etc", filter = combineFilters({
339+
{ name = "pre-combined-figures-theorems-etc",
340+
filter = combineFilters({
312341
file_metadata(),
313342
index_book_file_targets(),
314343
book_numbering(),
@@ -323,15 +352,23 @@ local quarto_pre_filters = {
323352
bootstrap_panel_layout(),
324353
bootstrap_panel_sidebar(),
325354
table_respecify_gt_css(),
326-
-- table_colwidth(),
355+
-- table_colwidth(),
327356
table_classes(),
328357
input_traits(),
329358
resolve_book_file_targets(),
330359
project_paths()
331-
}) },
360+
}),
361+
traverse = 'jog',
362+
},
332363

333-
{ name = "pre-quarto-pre-meta-inject", filter = quarto_pre_meta_inject() },
334-
{ name = "pre-write-results", filter = write_results() },
364+
{ name = "pre-quarto-pre-meta-inject",
365+
filter = quarto_pre_meta_inject(),
366+
traverse = 'jog',
367+
},
368+
{ name = "pre-write-results",
369+
filter = write_results(),
370+
traverse = 'jog',
371+
},
335372
}
336373

337374
local quarto_post_filters = {

0 commit comments

Comments
 (0)