Skip to content

Commit 070ed4e

Browse files
committed
Rely less on pandoc's type implicit conversions
1 parent d13503b commit 070ed4e

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

src/resources/filters/ast/customnodes.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,10 @@ _quarto.ast = {
387387
_quarto.ast.grow_scaffold(node, index)
388388
end
389389
local pt = pandoc.utils.type(value)
390-
if pt == "Block" or pt == "Inline" then
391-
node.content[index].content = {value}
390+
if pt == "Block" then
391+
node.content[index].content = pandoc.Blocks{value}
392+
elseif pt == "Inline" then
393+
node.content[index].content = pandoc.Inlines{value}
392394
else
393395
node.content[index].content = value
394396
end

src/resources/filters/crossref/equations.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function process_equations(blockEl)
2020
end
2121

2222
local mathInlines = nil
23-
local targetInlines = pandoc.List()
23+
local targetInlines = pandoc.Inlines{}
2424

2525
for i, el in ipairs(inlines) do
2626

src/resources/filters/crossref/preprocess.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function crossref_mark_subfloats()
77
return {
88
traverse = "topdown",
99
FloatRefTarget = function(float)
10-
float.content = _quarto.ast.walk(float.content, {
10+
float.content = _quarto.ast.walk(float.content or pandoc.Blocks{}, {
1111
FloatRefTarget = function(subfloat)
1212
float.has_subfloats = true
1313
crossref.subfloats[subfloat.identifier] = {

src/resources/filters/layout/html.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function renderHtmlFigure(el, render)
190190
end)
191191

192192
-- remove identifier (it is now on the div)
193-
el.identifier = ""
193+
el.attr.identifier = ""
194194

195195
if not figureDiv.classes:find_if(function(str) return str:match("quarto%-figure%-.+") end) then
196196
-- apply standalone figure css if not already set

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function fold_code_and_lift_codeblocks()
6565
local prev_annotated_code_block_scaffold = nil
6666
local prev_annotated_code_block = nil
6767
-- ok to lift codeblocks
68-
float.content = _quarto.ast.walk(float.content, {
68+
float.content = _quarto.ast.walk(float.content or pandoc.Blocks{}, {
6969
traverse = "topdown",
7070
DecoratedCodeBlock = function(block)
7171
-- defer the folding of code blocks to the DecoratedCodeBlock renderer

src/resources/filters/quarto-pre/code-annotation.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ function code_annotations()
310310
-- if code annotations is false, then shut it down
311311
if codeAnnotations ~= false then
312312

313-
local outputs = pandoc.List()
313+
local outputs = pandoc.Blocks{}
314314

315315
-- annotations[annotation-number] = {list of line numbers}
316316
local pendingAnnotations = nil

0 commit comments

Comments
 (0)