Fix #15

CHANGELOG.md

@@ -6,6 +6,8 @@
 ## Changed
 
 ## Fixed
+- Passing `grid` sub-elements to `subpar.grid` now correctly passses them though
+  to `grid`
 
 ---
 

src/lib.typ

@@ -273,7 +273,22 @@
     show-sub-caption: show-sub-caption,
 
     _grid(
-      .._util.stitch-pairs(figures).map(((f, l)) => [#f#l]),
+      .._util.stitch-pairs(figures).map(((f, l)) => if type(f) == content and f.func() == _grid.cell {
+        assert.eq(
+          l, none,
+          message: "When using `grid.cell` in `subpar.grid`, place labels inside the cell itself",
+        )
+        f
+      } else if type(f) == content and f.func() in (
+        _grid.hline,
+        _grid.vline,
+        _grid.header,
+        _grid.footer,
+      ) {
+        f
+      } else {
+        [#f#l]
+      }),
       ..grid-args,
     ),
   )

test/grid-cell/test.typ

@@ -0,0 +1,16 @@
+// Synopsis:
+// - passing a grid sub element works as expected
+
+#import "/test/util.typ": *
+#import "/src/lib.typ" as subpar
+
+#subpar.grid(
+  grid.cell([#figure(fake-image, caption: [Inner Caption]) <1a>], colspan: 2),
+  figure(fake-image, caption: [Inner Caption]), <1b>,
+  grid.vline(),
+  figure(fake-image, caption: [Inner Caption]), <1c>,
+  grid.hline(),
+  columns: (1fr, 1fr),
+  caption: [Super],
+  label: <1>,
+)