diff options
| author | Laurenz <laurmaedje@gmail.com> | 2024-09-25 10:26:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-25 08:26:41 +0000 |
| commit | e25389a85e2c4bb7bab5f5d68ab148395704960d (patch) | |
| tree | 1323af9efce63f9a8f412312ebe87e45bb87a60a /tests/suite/model | |
| parent | fd449f3e08df716d94d79f3f46ff3960e9933d0c (diff) | |
New flow layout, with multi-column floats (#5017)
Diffstat (limited to 'tests/suite/model')
| -rw-r--r-- | tests/suite/model/cite.typ | 3 | ||||
| -rw-r--r-- | tests/suite/model/figure.typ | 36 | ||||
| -rw-r--r-- | tests/suite/model/footnote.typ | 195 |
3 files changed, 37 insertions, 197 deletions
diff --git a/tests/suite/model/cite.typ b/tests/suite/model/cite.typ index ffbd3b52..f69fe9f4 100644 --- a/tests/suite/model/cite.typ +++ b/tests/suite/model/cite.typ @@ -102,8 +102,7 @@ B #cite(<netwok>) #cite(<arrgh>). // Everything moves to the second page because we want to keep the line and // its footnotes together. -#footnote[@netwok] -#footnote[A] +#footnote[@netwok \ A] #show bibliography: none #bibliography("/assets/bib/works.bib") diff --git a/tests/suite/model/figure.typ b/tests/suite/model/figure.typ index 13e94481..d71d92e3 100644 --- a/tests/suite/model/figure.typ +++ b/tests/suite/model/figure.typ @@ -41,6 +41,42 @@ We can clearly see that @fig-cylinder and caption: "A table containing images." ) <fig-image-in-table> +--- figure-placement --- +#set page(height: 160pt, columns: 2) +#set place(clearance: 10pt) + +#lines(4) + +#figure( + placement: auto, + scope: "page", + caption: [I], + rect(height: 15pt, width: 80%), +) + +#figure( + placement: bottom, + caption: [II], + rect(height: 15pt, width: 80%), +) + +#lines(2) + +#figure( + placement: bottom, + caption: [III], + rect(height: 25pt, width: 80%), +) + +#figure( + placement: auto, + scope: "page", + caption: [IV], + rect(width: 80%), +) + +#lines(15) + --- figure-theorem --- // Testing show rules with figures with a simple theorem display #show figure.where(kind: "theorem"): it => { diff --git a/tests/suite/model/footnote.typ b/tests/suite/model/footnote.typ deleted file mode 100644 index 41091228..00000000 --- a/tests/suite/model/footnote.typ +++ /dev/null @@ -1,195 +0,0 @@ -// Test footnotes. - ---- footnote-basic --- -#footnote[Hi] - ---- footnote-space-collapsing --- -// Test space collapsing before footnote. -A#footnote[A] \ -A #footnote[A] - ---- footnote-nested --- -// Test nested footnotes. -First \ -Second #footnote[A, #footnote[B, #footnote[C]]] \ -Third #footnote[D, #footnote[E]] \ -Fourth - ---- footnote-nested-same-frame --- -// Currently, numbers a bit out of order if a nested footnote ends up in the -// same frame as another one. :( -#footnote[A, #footnote[B]], #footnote[C] - ---- footnote-entry --- -// Test customization. -#show footnote: set text(red) -#show footnote.entry: set text(8pt, style: "italic") -#set footnote.entry( - indent: 0pt, - gap: 0.6em, - clearance: 0.3em, - separator: repeat[.], -) - -Beautiful footnotes. #footnote[Wonderful, aren't they?] - ---- footnote-break-across-pages --- -#set page(height: 200pt) - -#lines(2) -#footnote[ // 1 - I - #footnote[II ...] // 2 -] -#lines(6) -#footnote[III: #lines(8, "1")] // 3 -#lines(6) -#footnote[IV: #lines(15, "1")] // 4 -#lines(6) -#footnote[V] // 5 - ---- footnote-in-columns --- -// Test footnotes in columns, even those that are not enabled via `set page`. -#set page(height: 120pt) -#align(center, strong[Title]) - -#show: columns.with(2) -#lines(3) -#footnote(lines(4, "1")) - -#lines(2) -#footnote(lines(2, "1")) - ---- footnote-in-caption --- -// Test footnote in caption. -Read the docs #footnote[https://typst.app/docs]! -#figure( - image("/assets/images/graph.png", width: 70%), - caption: [ - A graph #footnote[A _graph_ is a structure with nodes and edges.] - ] -) -More #footnote[just for ...] footnotes #footnote[... testing. :)] - ---- footnote-duplicate --- -// Test duplicate footnotes. -#let lang = footnote[Languages.] -#let nums = footnote[Numbers.] - -/ "Hello": A word #lang -/ "123": A number #nums - -- "Hello" #lang -- "123" #nums - -+ "Hello" #lang -+ "123" #nums - -#table( - columns: 2, - [Hello], [A word #lang], - [123], [A number #nums], -) - ---- footnote-invariant --- -// Ensure that a footnote and the first line of its entry -// always end up on the same page. -#set page(height: 120pt) - -#lines(5) - -A #footnote(lines(6, "1")) - ---- footnote-ref --- -// Test references to footnotes. -A footnote #footnote[Hi]<fn> \ -A reference to it @fn - ---- footnote-ref-multiple --- -// Multiple footnotes are refs -First #footnote[A]<fn1> \ -Second #footnote[B]<fn2> \ -First ref @fn1 \ -Third #footnote[C] \ -Fourth #footnote[D]<fn4> \ -Fourth ref @fn4 \ -Second ref @fn2 \ -Second ref again @fn2 - ---- footnote-ref-forward --- -// Forward reference -Usage @fn \ -Definition #footnote[Hi]<fn> - ---- footnote-ref-in-footnote --- -// Footnote ref in footnote -#footnote[Reference to next @fn] -#footnote[Reference to myself @fn]<fn> -#footnote[Reference to previous @fn] - ---- footnote-styling --- -// Styling -#show footnote: text.with(fill: red) -Real #footnote[...]<fn> \ -Ref @fn - ---- footnote-ref-call --- -// Footnote call with label -#footnote(<fn>) -#footnote[Hi]<fn> -#ref(<fn>) -#footnote(<fn>) - ---- footnote-in-table --- -// Test footnotes in tables. When the table spans multiple pages, the footnotes -// will all be after the table, but it shouldn't create any empty pages. -#set page(height: 100pt) - -= Tables -#table( - columns: 2, - [Hello footnote #footnote[This is a footnote.]], - [This is more text], - [This cell - #footnote[This footnote is not on the same page] - breaks over multiple pages.], - image("/assets/images/tiger.jpg"), -) - -#table( - columns: 3, - ..range(1, 10) - .map(numbering.with("a")) - .map(v => upper(v) + footnote(v)) -) - ---- issue-multiple-footnote-in-one-line --- -// Test that the logic that keeps footnote entry together with -// their markers also works for multiple footnotes in a single -// line. -#set page(height: 100pt) -#v(50pt) -A #footnote[a] -B #footnote[b] - ---- issue-1433-footnote-in-list --- -// Test that footnotes in lists do not produce extraneous page breaks. The list -// layout itself does not currently react to the footnotes layout, weakening the -// "footnote and its entry are on the same page" invariant somewhat, but at -// least there shouldn't be extra page breaks. -#set page(height: 100pt) -#block(height: 50pt, width: 100%, fill: aqua) - -- #footnote[1] -- #footnote[2] - ---- issue-footnotes-skip-first-page --- -// In this issue, we would get an empty page at the beginning because footnote -// layout didn't properly check for in_last. -#set page(height: 50pt) -#footnote[A] -#footnote[B] - ---- issue-4454-footnote-ref-numbering --- -// Test that footnote references are numbered correctly. -A #footnote(numbering: "*")[B]<fn>, C @fn, D @fn, E @fn. |
