Merge pull request #9944 from quarto-dev/bugfix/9243

Fix: DecoratedCodeBlocks inside FloatRefTargets

Author: cscheid

news/changelog-1.5.md

@@ -22,6 +22,7 @@ All changes included in 1.5:
 - ([#8841](https://github.com/quarto-dev/quarto-cli/issues/8841)): Do not parse LaTeX table when crossref label doesn't start with `tbl-`.
 - ([#9582](https://github.com/quarto-dev/quarto-cli/issues/9582)): Forward column classes and attributes correctly to floats inside divs with column classes.
 - ([#9729](https://github.com/quarto-dev/quarto-cli/issues/9729)): Fix performance issue with Lua pattern matching and multiple capture groups.
+- ([#9944](https://github.com/quarto-dev/quarto-cli/issues/9944)): Fix issue with `lst-` crossrefs, `filename` attributes, and syntax highlighting.
 
 ## RevealJS Format
 

src/resources/filters/customnodes/floatreftarget.lua

@@ -327,6 +327,18 @@ end, function(float)
     float.content.caption.long = float.caption_long
     float.content.attr = pandoc.Attr(float.identifier, float.classes or {}, float.attributes or {})
     return float.content
+  elseif float_type == "lst" then
+    local handle_code_block = function(codeblock)
+      codeblock.attr = merge_attrs(codeblock.attr, pandoc.Attr("", float.classes or {}, float.attributes or {}))
+      return codeblock
+    end
+    if float.content.t == "CodeBlock" then
+      float.content = handle_code_block(float.content)
+    else
+      float.content = _quarto.ast.walk(float.content, {
+        CodeBlock = handle_code_block
+      })
+    end
   end
 
   local fig_scap = attribute(float, kFigScap, nil)

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

@@ -289,6 +289,19 @@ function render_latex()
             return nil, false
           end,
         })
+      elseif float.type == "Listing" then
+        float.content = _quarto.ast.walk(float.content, {
+          traverse = "topdown",
+          -- A Listing float with a decoratedcodeblock inside it needs
+          -- to be deconstructed
+          DecoratedCodeBlock = function(block)
+            if block.filename ~= nil then
+              float.caption_long.content:insert(1, pandoc.Space())
+              float.caption_long.content:insert(1, pandoc.Code(block.filename))
+            end
+            return block.code_block
+          end
+        })
       end
       float.content = _quarto.ast.walk(quarto.utils.as_blocks(float.content), {
         PanelLayout = function(panel)

tests/docs/smoke-all/2024/06/10/9243-a.qmd

@@ -0,0 +1,13 @@
+---
+format: latex
+_quarto:
+  tests:
+    latex:
+      ensureFileRegexMatches:
+        - ["Shaded"]
+        - ["tcolorbox"]
+---
+
+```{#lst-1 .python lst-cap="A caption"}
+print("Hello, World!")
+```

tests/docs/smoke-all/2024/06/10/9243-b.qmd

@@ -0,0 +1,43 @@
+---
+format: latex
+_quarto:
+  tests:
+    latex:
+      ensureFileRegexMatches:
+        - ["Shaded", "foo.py", "bar.py"]
+        - ["tcolorbox"]
+---
+
+::: {#lst-1 filename="foo.py"}
+
+```{.python}
+print("Hello, World!")
+```
+
+A caption.
+
+:::
+
+::: {#lst-2}
+
+```{.python filename="bar.py"}
+print("Hello, World!")
+```
+
+Another caption.
+
+:::
+
+
+::: {#lst-3}
+
+```{.python}
+print("Hello, World!")
+```
+
+A caption.
+
+:::
+
+
+See @lst-1, @lst-2, @lst-3.