html,listings - avoid duplicate ids, keep classes on codeblocks

Author: cscheid

src/resources/filters/customnodes/floatreftarget.lua

@@ -335,18 +335,6 @@ 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)
@@ -630,19 +618,6 @@ _quarto.ast.add_renderer("FloatRefTarget", function(_)
   return _quarto.format.isHtmlOutput()
 end, function(float)
   decorate_caption_with_crossref(float)
-
-  ------------------------------------------------------------------------------------
-  -- Special handling for listings
-  local found_listing = get_node_from_float_and_type(float, "CodeBlock")
-  if found_listing then
-    found_listing.attr = merge_attrs(found_listing.attr, pandoc.Attr("", float.classes or {}, float.attributes or {}))
-    -- FIXME this seems to be necessary for our postprocessor to kick in
-    -- check this out later
-    found_listing.identifier = float.identifier
-  end
-
-  ------------------------------------------------------------------------------------
-  
   return float_reftarget_render_html_figure(float)
 end)
 
@@ -1017,13 +992,6 @@ end, function(float)
     -- Listings shouldn't emit centered blocks. 
     -- We don't know how to disable that right now using #show rules for #figures in template.
     content:insert(1, pandoc.RawBlock("typst", "#set align(left)"))
-
-    -- Classes and attributes for the CodeBlocks needs to be set from the parsed floats to the CodeBlock
-    local found_listing = get_node_from_float_and_type(float, "CodeBlock")
-    if found_listing then
-      found_listing.attr = merge_attrs(found_listing.attr, pandoc.Attr("", float.classes or {}, float.attributes or {}))
-    end
-
   end
 
   if float.has_subfloats then

src/resources/filters/quarto-pre/parsefiguredivs.lua

@@ -656,8 +656,8 @@ function parse_floatreftargets()
       end
       code.attr.attributes['lst-cap'] = nil
 
-      local attr = code.attr
-      -- code.attr = pandoc.Attr("", {}, {})
+      local attr = pandoc.Attr(code.identifier, code.attr.classes, code.attr.attributes)
+      code.attr = pandoc.Attr("", code.classes, code.attr.attributes)
       return construct({
         attr = attr,
         type = "Listing",
@@ -686,7 +686,7 @@ function parse_floatreftargets()
       end
 
       local attr = code.attr
-      code.attr = pandoc.Attr("", {}, {})
+      code.attr = pandoc.Attr("", code.classes, code.attr.attributes)
       return construct({
         attr = attr,
         type = "Listing",

tests/docs/smoke-all/2025/03/25/issue-12354.qmd

@@ -0,0 +1,20 @@
+---
+format: 
+  typst: default
+  html: default
+_quarto:
+  tests:
+    html:
+      ensureHtmlElements:
+        - ['div#lst-1.listing', 'div#lst-2.listing']
+        - ['div#lst-1.sourceCode', 'div#lst-2.sourceCode']
+---
+
+```{#lst-1 .r filename="asdfoasdf.R" lst-cap="A listing." my-key="value"}
+print("Hello, world!")
+```
+
+
+```{#lst-2 .r lst-cap="A listing." my-key="value"}
+print("Hello, world!")
+```

tests/docs/smoke-all/crossrefs/float/latex/latex-listings-1.qmd

@@ -5,7 +5,7 @@ _quarto:
   tests:
     latex:
       ensureFileRegexMatches:
-        - []
+        - [Shaded]
         - []
 ---