Merge pull request #7305 from quarto-dev/bugfix/7917b

better fix for #7197 and fenced code blocks

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

@@ -583,23 +583,24 @@ function forward_cell_subcaps()
             return nil
           end
           -- now we attempt to insert subcaptions where it makes sense for them to be inserted
-
-          if is_regular_node(subdiv.content[1], "Table") then
-            subdiv.content[1].caption.long = quarto.utils.as_blocks(pandoc.Str(subcaps[index]))
-            subdiv.content[1].identifier = div.identifier .. "-" .. tostring(index)
-            index = index + 1
-            return subdiv
-          end
-
-          local fig = discoverFigure(subdiv.content[1], false) or discoverLinkedFigure(subdiv.content[1], false)
-          if fig ~= nil then
-            fig.caption = quarto.utils.as_inlines(pandoc.Str(subcaps[index]))
-            fig.identifier = div.identifier .. "-" .. tostring(index)
-            index = index + 1
-            return subdiv
-          end
-
-          return nil
+          subdiv.content = _quarto.ast.walk(subdiv.content, {
+            Table = function(pandoc_table)
+              pandoc_table.caption.long = quarto.utils.as_blocks(pandoc.Str(subcaps[index]))
+              pandoc_table.identifier = div.identifier .. "-" .. tostring(index)
+              index = index + 1
+              return pandoc_table
+            end,
+            Para = function(maybe_float)
+              local fig = discoverFigure(maybe_float, false) or discoverLinkedFigure(maybe_float, false)
+              if fig ~= nil then
+                fig.caption = quarto.utils.as_inlines(pandoc.Str(subcaps[index]))
+                fig.identifier = div.identifier .. "-" .. tostring(index)
+                index = index + 1
+                return maybe_float
+              end
+            end,
+          })
+          return subdiv
         end
       })
       if index ~= 1 then

tests/docs/smoke-all/2023/10/19/7197b.qmd

@@ -0,0 +1,33 @@
+---
+title: "Table subcaption issue"
+format: html
+_quarto:
+  tests:
+    html:
+      ensureFileRegexMatches:
+        - 
+          - "\\(a\\) Cars"
+          - "\\(b\\) Pressure"
+        - []
+      ensureHtmlElements:
+        -
+          - "a[href=\"#tbl-example\"].quarto-xref"
+          - "a[href=\"#tbl-example-1\"].quarto-xref"
+          - "a[href=\"#tbl-example-2\"].quarto-xref"
+---
+
+
+```{r}
+#| label: tbl-example
+#| tbl-cap: "Example"
+#| tbl-subcap: 
+#|   - "Cars"
+#|   - "Pressure"
+#| echo: fenced
+
+library(knitr)
+kable(head(cars))
+kable(head(pressure))
+```
+
+See @tbl-example-1, @tbl-example-2, @tbl-example.