diff --git a/tests/suite/layout/grid/subheaders.typ b/tests/suite/layout/grid/subheaders.typ index 3d790460b..56bed6a57 100644 --- a/tests/suite/layout/grid/subheaders.typ +++ b/tests/suite/layout/grid/subheaders.typ @@ -54,120 +54,71 @@ --- grid-subheaders-basic --- #grid( - grid.header( - [a] - ), - grid.header( - level: 2, - [b] - ), + grid.header([a]), + grid.header(level: 2, [b]), [c] ) --- grid-subheaders-basic-non-consecutive --- #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], ) --- grid-subheaders-basic-replace --- #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), [z], ) --- grid-subheaders-basic-with-footer --- #grid( - grid.header( - [a] - ), - grid.header( - level: 2, - [b] - ), + grid.header([a]), + grid.header(level: 2, [b]), [c], - grid.footer( - [d] - ) + grid.footer([d]) ) --- grid-subheaders-basic-non-consecutive-with-footer --- #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-repeat --- #set page(height: 8em) #grid( - grid.header( - [a] - ), - grid.header( - level: 2, - [b] - ), + grid.header([a]), + grid.header(level: 2, [b]), ..([c],) * 10, ) --- grid-subheaders-repeat-non-consecutive --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 10, ) --- grid-subheaders-repeat-with-footer --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [m], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([c],) * 10, - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-repeat-gutter --- @@ -177,55 +128,31 @@ inset: (bottom: 0.5pt), stroke: (bottom: 1pt), gutter: (1pt, 6pt, 1pt), - grid.header( - [a] - ), - grid.header( - level: 2, - [b] - ), + grid.header([a]), + grid.header(level: 2, [b]), ..([c],) * 10, ) --- grid-subheaders-repeat-replace --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 10, - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), ..([z],) * 10, ) --- grid-subheaders-repeat-replace-multiple-levels --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), ..([y],) * 10, - grid.header( - level: 2, - [d] - ), + grid.header(level: 2, [d]), ..([z],) * 6, ) @@ -233,61 +160,34 @@ #set page(height: 8em) #grid( gutter: 3pt, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 8, - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), ..([z],) * 4, ) --- grid-subheaders-repeat-replace-orphan --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 12, - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), ..([z],) * 10, ) --- grid-subheaders-repeat-replace-double-orphan --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 11, - grid.header( - level: 2, - [c] - ), - grid.header( - level: 3, - [d] - ), + grid.header(level: 2, [c]), + grid.header(level: 3, [d]), ..([z],) * 10, ) @@ -295,19 +195,11 @@ #set page(height: 8em) #grid( gutter: 3pt, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 9, - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), [z \ z], ..([z],) * 3, ) @@ -316,88 +208,49 @@ #set page(height: 8em) #grid( gutter: 3pt, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 9, box(height: 3pt), - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), ..([z],) * 4, ) --- grid-subheaders-repeat-replace-didnt-fit-once --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 10, - grid.header( - level: 2, - [c\ c\ c] - ), + grid.header(level: 2, [c\ c\ c]), ..([z],) * 4, ) --- grid-subheaders-repeat-replace-with-footer --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), ..([y],) * 10, - grid.header( - level: 2, - [d] - ), + grid.header(level: 2, [d]), ..([z],) * 6, - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-repeat-replace-with-footer-orphan --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 10, - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [c]), ..([z],) * 10, - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-repeat-replace-short-lived --- @@ -405,49 +258,17 @@ // (followed by replacing headers). #set page(height: 8em) #grid( - grid.header( - [a] - ), - grid.header( - level: 2, - [b] - ), - grid.header( - level: 2, - [c] - ), - grid.header( - level: 2, - [d] - ), - grid.header( - level: 2, - [e] - ), - grid.header( - level: 2, - [f] - ), - grid.header( - level: 2, - [g] - ), - grid.header( - level: 2, - [h] - ), - grid.header( - level: 2, - [i] - ), - grid.header( - level: 2, - [j] - ), - grid.header( - level: 3, - [k] - ), + grid.header([a]), + grid.header(level: 2, [b]), + grid.header(level: 2, [c]), + grid.header(level: 2, [d]), + grid.header(level: 2, [e]), + grid.header(level: 2, [f]), + grid.header(level: 2, [g]), + grid.header(level: 2, [h]), + grid.header(level: 2, [i]), + grid.header(level: 2, [j]), + grid.header(level: 3, [k]), ..([z],) * 10, ) @@ -456,51 +277,18 @@ #set page(height: 8em) #grid( // This has to go - grid.header( - [a], - level: 3, - ), + grid.header(level: 3, [a]), [w], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 2, - [c] - ), - grid.header( - level: 2, - [d] - ), - grid.header( - level: 2, - [e] - ), - grid.header( - level: 2, - [f] - ), - grid.header( - level: 2, - [g] - ), - grid.header( - level: 2, - [h] - ), - grid.header( - level: 2, - [i] - ), - grid.header( - level: 2, - [j] - ), - grid.header( - level: 3, - [k] - ), + grid.header(level: 2, [b]), + grid.header(level: 2, [c]), + grid.header(level: 2, [d]), + grid.header(level: 2, [e]), + grid.header(level: 2, [f]), + grid.header(level: 2, [g]), + grid.header(level: 2, [h]), + grid.header(level: 2, [i]), + grid.header(level: 2, [j]), + grid.header(level: 3, [k]), ..([z],) * 10, ) @@ -508,19 +296,11 @@ #set page(height: 8em) #grid( columns: 2, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 3, - [c] - ), + grid.header(level: 3, [c]), [a], [b], grid.cell( block(fill: red, width: 1.5em, height: 6.4em) @@ -532,80 +312,43 @@ --- grid-subheaders-non-repeat --- #set page(height: 8em) #grid( - grid.header( - [a], - repeat: false, - ), + grid.header(repeat: false, [a]), [x], - grid.header( - level: 2, - repeat: false, - [b] - ), + grid.header(level: 2, repeat: false, [b]), ..([y],) * 10, ) --- grid-subheaders-non-repeat-replace --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), ..([y],) * 9, - grid.header( - level: 2, - [d], - repeat: false, - ), + grid.header(level: 2, repeat: false, [d]), ..([z],) * 6, ) --- grid-subheaders-non-repeating-replace-orphan --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 12, - grid.header( - level: 2, - repeat: false, - [c] - ), + grid.header(level: 2, repeat: false, [c]), ..([z],) * 10, ) --- grid-subheaders-non-repeating-replace-didnt-fit-once --- #set page(height: 8em) #grid( - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), ..([y],) * 10, - grid.header( - level: 2, - repeat: false, - [c\ c\ c] - ), + grid.header(level: 2, repeat: false, [c\ c\ c]), ..([z],) * 4, ) @@ -613,19 +356,11 @@ #set page(height: 8em) #grid( columns: 2, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 3, - [c] - ), + grid.header(level: 3, [c]), [z], [z], grid.cell( rowspan: 5, @@ -639,18 +374,10 @@ #set page(height: 8em) #grid( columns: 1, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), grid.cell( block(fill: red, width: 1.5em, height: 6.4em) ), @@ -662,18 +389,10 @@ #set page(height: 8em) #grid( columns: 2, - grid.header( - [a] - ), + grid.header([a]), [x], [y], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), grid.cell( rowspan: 5, block(fill: red, width: 1.5em, height: 6.4em) @@ -688,47 +407,29 @@ #set page(height: 8em) #grid( columns: 2, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 3, - [c] - ), + grid.header(level: 3, [c]), [a], [b], grid.cell( block(fill: red, width: 1.5em, height: 6.4em) ), [y], ..([z],) * 10, - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-multi-page-rowspan-with-footer --- #set page(height: 8em) #grid( columns: 2, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 3, - [c] - ), + grid.header(level: 3, [c]), [z], [z], grid.cell( rowspan: 5, @@ -736,35 +437,23 @@ ), [cell], [cell], - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-multi-page-row-right-after-with-footer --- #set page(height: 8em) #grid( columns: 1, - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), - grid.header( - level: 3, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 3, [c]), grid.cell( block(fill: red, width: 1.5em, height: 6.4em) ), [done.], [done.], - grid.footer( - [f] - ) + grid.footer([f]) ) --- grid-subheaders-multi-page-rowspan-gutter --- @@ -775,19 +464,11 @@ row-gutter: (0pt, 4pt, 8pt, 4pt), inset: (bottom: 0.5pt), stroke: (bottom: 1pt), - grid.header( - [a] - ), + grid.header([a]), [x], - grid.header( - level: 2, - [b] - ), + grid.header(level: 2, [b]), [y], - grid.header( - level: 3, - [c] - ), + grid.header(level: 3, [c]), [z], [z], grid.cell( rowspan: 5, @@ -802,10 +483,7 @@ --- grid-subheaders-non-repeating-header-before-multi-page-row --- #set page(height: 6em) #grid( - grid.header( - repeat: false, - [h] - ), + grid.header(repeat: false, [h]), [row #colbreak() row] ) @@ -815,14 +493,8 @@ #set page(height: 8em) #v(5em) #grid( - grid.header( - level: 2, - [b] - ), - grid.header( - level: 2, - [c] - ), + grid.header(level: 2, [b]), + grid.header(level: 2, [c]), [d] ) @@ -830,16 +502,8 @@ #set page(height: 8em) #v(4.5em) #grid( - grid.header( - repeat: true, - level: 2, - [L2] - ), - grid.header( - repeat: true, - level: 4, - [L4] - ), + grid.header(repeat: true, level: 2, [L2]), + grid.header(repeat: true, level: 4, [L4]), [a] ) @@ -847,43 +511,23 @@ #set page(height: 8em) #v(4.5em) #grid( - grid.header( - repeat: false, - level: 2, - [L2] - ), - grid.header( - repeat: false, - level: 4, - [L4] - ), + grid.header(repeat: false, level: 2, [L2]), + grid.header(repeat: false, level: 4, [L4]), [a] ) --- grid-subheaders-alone --- #table( - table.header( - [a] - ), - table.header( - level: 2, - [b] - ), + table.header([a]), + table.header(level: 2, [b]), ) --- grid-subheaders-alone-no-orphan-prevention --- #set page(height: 5.3em) #v(2em) #grid( - grid.header( - // ( - [L1] - ), - grid.header( - // ( - level: 2, - [L2] - ), + grid.header([L1]), + grid.header(level: 2, [L2]), ) --- grid-subheaders-alone-with-gutter-no-orphan-prevention --- @@ -891,71 +535,39 @@ #v(2em) #grid( gutter: 3pt, - grid.header( - // ( - [L1] - ), - grid.header( - // ( - level: 2, - [L2] - ), + grid.header([L1]), + grid.header(level: 2, [L2]), ) --- grid-subheaders-alone-with-footer --- #table( - table.header( - [a] - ), - table.header( - level: 2, - [b] - ), - table.footer( - [c], - ) + table.header([a]), + table.header(level: 2, [b]), + table.footer([c]) ) --- grid-subheaders-alone-with-footer-no-orphan-prevention --- #set page(height: 5.3em) #table( - table.header( - [L1] - ), - table.header( - level: 2, - [L2] - ), - table.footer( - [a], - ) + table.header([L1]), + table.header(level: 2, [L2]), + table.footer([a]) ) --- grid-subheaders-alone-with-gutter-and-footer-no-orphan-prevention --- #set page(height: 5.5em) #table( gutter: 4pt, - table.header( - [L1] - ), - table.header( - level: 2, - [L2] - ), - table.footer( - [a], - ) + table.header([L1]), + table.header(level: 2, [L2]), + table.footer([a]) ) --- grid-subheaders-too-large-non-repeating-orphan-before-auto --- #set page(height: 8em) #grid( grid.header([1]), - grid.header( - [a\ ] * 2, - level: 2, - repeat: false, - ), + grid.header([a\ ] * 2, level: 2, repeat: false), grid.header([2], level: 3), [b\ b\ b], ) @@ -964,11 +576,7 @@ #set page(height: 8em) #grid( grid.header([1]), - grid.header( - [a\ ] * 2, - level: 2, - repeat: true, - ), + grid.header([a\ ] * 2, level: 2, repeat: true), grid.header([2], level: 3), rect(width: 10pt, height: 3em, fill: red), ) @@ -978,11 +586,7 @@ #grid( rows: (auto, auto, auto, 3em), grid.header([1]), - grid.header( - [a\ ] * 2, - level: 2, - repeat: true, - ), + grid.header([a\ ] * 2, level: 2, repeat: true), grid.header([2], level: 3), rect(width: 10pt, height: 3em, fill: red), ) @@ -992,11 +596,7 @@ #grid( rows: (auto, auto, auto, 3em), grid.header([1]), - grid.header( - [a\ ] * 2, - level: 2, - repeat: false, - ), + grid.header([a\ ] * 2, level: 2, repeat: false), grid.header([2], level: 3), rect(width: 10pt, height: 3em, fill: red), )