Merge pull request #10865 from quarto-dev/bugfix/10858

floatreftarget,gfm - don't crash when pandoc.utils.type(float.content) == 'Blocks'

news/changelog-1.6.md

@@ -11,6 +11,7 @@ All changes included in 1.6:
 - ([#10196](https://github.com/quarto-dev/quarto-cli/issues/10196)): Protect against nil values in `float.caption_long`.
 - ([#10328](https://github.com/quarto-dev/quarto-cli/issues/10328)): Interpret subcells as subfloats when subcap count matches subcell count.
 - ([#10624](https://github.com/quarto-dev/quarto-cli/issues/10624)): Don't crash when proof environments are empty in `pdf`.
+- ([#10858](https://github.com/quarto-dev/quarto-cli/issues/10858)): Don't crash in `gfm` when `content` of a `FloatRefTarget` is of type `Blocks`.
 
 ## `dashboard` Format
 

src/resources/filters/customnodes/floatreftarget.lua

@@ -1045,23 +1045,33 @@ end, function(float)
 
   local open_block = pandoc.RawBlock("markdown", "<div id=\"" .. float.identifier .. "\">\n")
   local close_block = pandoc.RawBlock("markdown", "\n</div>")
+  local result = pandoc.Blocks({open_block})
+  local insert_content = function()
+    if pandoc.utils.type(float.content) == "Block" then
+      result:insert(float.content)
+    else
+      result:extend(quarto.utils.as_blocks(float.content))
+    end
+  end
+  local insert_caption = function()
+    if pandoc.utils.type(float.caption_long) == "Block" then
+      result:insert(float.caption_long)
+    else
+      result:insert(pandoc.Plain(quarto.utils.as_inlines(float.caption_long)))
+    end
+  end
 
   if caption_location == "top" then
-    return pandoc.Blocks({
-      open_block,
-      float.caption_long,
-      float.content,
-      close_block
-    })
+    insert_caption()
+    insert_content()
+    result:insert(close_block)
   else
-    return pandoc.Blocks({
-      open_block,
-      float.content,
-      pandoc.RawBlock("markdown", "\n"),
-      float.caption_long,
-      close_block
-    })
+    insert_content()
+    result:insert(pandoc.RawBlock("markdown", "\n"))
+    insert_caption()
+    result:insert(close_block)
   end
+  return result
 end)
 
 _quarto.ast.add_renderer("FloatRefTarget", function(_)

tests/docs/smoke-all/2024/09/23/issue-10858.qmd

@@ -0,0 +1,17 @@
+---
+title: "Test"
+format: gfm
+---
+
+::: {#fig-line-plot}
+
+```python
+import matplotlib.pyplot as plt
+plt.plot([1,23,2,4])
+plt.show()
+```
+
+Some output
+
+A line plot
+:::