Fix PDF crash with subfigures that each carry an apa-note (#158)

_extensions/apaquarto/apafloatlatex.lua

@@ -193,6 +193,26 @@ local processfloat = function(float)
   end
 
   if float.type == "Figure" then
+    -- Don't wrap sub-figures in their own figure environment (nested figure
+    -- environments are illegal in latex); render natively and append the note
+    if float.parent_id then
+      if float.attributes["apa-note"] then
+        local subbeforenote = ""
+        float.content:walk {
+          Image = function(img)
+            if img.attributes["beforenotespace"] then
+              subbeforenote = "\\vspace{" .. img.attributes["beforenotespace"] .. "}\n"
+            end
+          end
+        }
+        local note_prefix = pandoc.Span(pandoc.RawInline("latex", subbeforenote .. noteprefix))
+        local subnote = utilsapa.make_note(float.attributes["apa-note"], note_prefix)
+        local newcontent = pandoc.Blocks(float.content)
+        newcontent:insert(subnote)
+        float.content = newcontent
+      end
+      return float
+    end
     local hasnote = false
     local apanote
     local twocolumn = false
@@ -251,13 +271,14 @@ local processfloat = function(float)
         floatposition = ""
       end
 
+      -- splice content as Blocks (a layout figure's content is a list, not a Block)
       local returnblock = pandoc.Div({
         pandoc.RawBlock("latex", "\\begin{" .. latexenv .. "}" .. floatposition),
-        captionspan,
-        float.content,
-        apanotedivs,
-        pandoc.RawBlock("latex", "\\end{" .. latexenv .. "}")
+        captionspan
       })
+      returnblock.content:extend(pandoc.Blocks(float.content))
+      returnblock.content:insert(apanotedivs)
+      returnblock.content:insert(pandoc.RawBlock("latex", "\\end{" .. latexenv .. "}"))
 
       return returnblock
     end

tests/issue-158-subfigure-notes.qmd

@@ -0,0 +1,100 @@
+---
+title: "Subfigure Figure-Note Reproducer"
+shorttitle: "Issue 158"
+author:
+  - name: Test Author
+    corresponding: true
+    email: test@example.com
+    affiliations:
+      - name: Test University
+floatsintext: true
+keep-tex: true
+format:
+  apaquarto-pdf:
+    documentmode: man
+---
+
+<!--
+Reproducer for issue #158: rendering a figure made of multiple subfigures,
+each carrying an APA-style `apa-note`, crashed the apaquarto-pdf format with
+
+    Block, list of Blocks, or compatible element expected, got table
+    ...apaquarto/apafloatlatex.lua:254: in local 'filter_fn'
+
+and, once that crash was fixed, produced illegal nested LaTeX `figure`
+environments ("Not in outer par mode").
+
+Render from the repository root (so `_extensions/` and `sampleimage.png`
+resolve), e.g. by copying this file next to `example.qmd`:
+
+    cp tests/issue-158-subfigure-notes.qmd ./_issue158.qmd
+    quarto render _issue158.qmd --to apaquarto-pdf
+
+A successful run produces a PDF in which every figure note below is visible,
+every figure cross-reference resolves (no "Figure ??"), and no LaTeX
+"Not in outer par mode" error is raised.
+-->
+
+# 1. Single figure with a note (control)
+
+A lone figure with `apa-note` already worked; it must keep working
+(@fig-single).
+
+![A single image.](sampleimage.png){#fig-single width="2in"
+apa-note="This note belongs to a single, non-subfigure figure."}
+
+# 2. Subfigures, each with a note -- exactly as reported (the bug)
+
+This block matches the minimal example in issue #158: a subfigure layout with
+no overall caption, where each panel carries its own `apa-note`. Before the fix
+it crashed the PDF render (@fig-bug).
+
+::: {#fig-bug layout-ncol=2}
+![First panel.](sampleimage.png){#fig-bug-a width="2in"
+apa-note="Note for the first panel."}
+
+![Second panel.](sampleimage.png){#fig-bug-b width="2in"
+apa-note="Note for the second panel."}
+:::
+
+# 3. Subfigures with a note and an overall caption
+
+The same situation but with an overall figure caption (@fig-capnotes).
+
+::: {#fig-capnotes layout-ncol=2}
+![First panel.](sampleimage.png){#fig-capnotes-a width="2in"
+apa-note="Note for the first panel."}
+
+![Second panel.](sampleimage.png){#fig-capnotes-b width="2in"
+apa-note="Note for the second panel."}
+
+An overall caption for the whole figure.
+:::
+
+# 4. Subfigures where only one panel has a note (mixed)
+
+Only the second panel has a note; the first must render without one
+(@fig-mixed).
+
+::: {#fig-mixed layout-ncol=2}
+![Panel without a note.](sampleimage.png){#fig-mixed-a width="2in"}
+
+![Panel with a note.](sampleimage.png){#fig-mixed-b width="2in"
+apa-note="Only this panel has a note."}
+
+An overall caption for the mixed figure.
+:::
+
+# 5. A table with a note (untouched Table path)
+
+The table branch of the filter is unchanged; confirm it still works
+(@tbl-note).
+
+| Group | Value |
+|-------|-------|
+| A     | 1     |
+| B     | 2     |
+
+: A small table. {#tbl-note apa-note="This note belongs to the table."}
+
+Some text after the floats to confirm the document rendered completely.