From a1a521523451c693218274d2f88466a07bfff9ea Mon Sep 17 00:00:00 2001 From: PgBiel <9021226+PgBiel@users.noreply.github.com> Date: Sun, 8 Dec 2024 13:25:47 -0300 Subject: Ensure par and align interrupt cite groups and lists (#5526) --- ...ue-5503-cite-group-interrupted-by-par-align.png | Bin 0 -> 1487 bytes tests/ref/issue-5503-cite-in-align.png | Bin 0 -> 393 bytes .../issue-5503-enum-interrupted-by-par-align.png | Bin 0 -> 1004 bytes .../issue-5503-list-interrupted-by-par-align.png | Bin 0 -> 415 bytes .../issue-5503-terms-interrupted-by-par-align.png | Bin 0 -> 569 bytes tests/suite/model/cite.typ | 22 +++++++++++++++++++++ tests/suite/model/enum.typ | 12 +++++++++++ tests/suite/model/list.typ | 15 ++++++++++++++ tests/suite/model/terms.typ | 15 ++++++++++++++ 9 files changed, 64 insertions(+) create mode 100644 tests/ref/issue-5503-cite-group-interrupted-by-par-align.png create mode 100644 tests/ref/issue-5503-cite-in-align.png create mode 100644 tests/ref/issue-5503-enum-interrupted-by-par-align.png create mode 100644 tests/ref/issue-5503-list-interrupted-by-par-align.png create mode 100644 tests/ref/issue-5503-terms-interrupted-by-par-align.png (limited to 'tests') diff --git a/tests/ref/issue-5503-cite-group-interrupted-by-par-align.png b/tests/ref/issue-5503-cite-group-interrupted-by-par-align.png new file mode 100644 index 00000000..16633158 Binary files /dev/null and b/tests/ref/issue-5503-cite-group-interrupted-by-par-align.png differ diff --git a/tests/ref/issue-5503-cite-in-align.png b/tests/ref/issue-5503-cite-in-align.png new file mode 100644 index 00000000..aeb72aa0 Binary files /dev/null and b/tests/ref/issue-5503-cite-in-align.png differ diff --git a/tests/ref/issue-5503-enum-interrupted-by-par-align.png b/tests/ref/issue-5503-enum-interrupted-by-par-align.png new file mode 100644 index 00000000..9cc942b4 Binary files /dev/null and b/tests/ref/issue-5503-enum-interrupted-by-par-align.png differ diff --git a/tests/ref/issue-5503-list-interrupted-by-par-align.png b/tests/ref/issue-5503-list-interrupted-by-par-align.png new file mode 100644 index 00000000..2b785c4b Binary files /dev/null and b/tests/ref/issue-5503-list-interrupted-by-par-align.png differ diff --git a/tests/ref/issue-5503-terms-interrupted-by-par-align.png b/tests/ref/issue-5503-terms-interrupted-by-par-align.png new file mode 100644 index 00000000..1bdacd94 Binary files /dev/null and b/tests/ref/issue-5503-terms-interrupted-by-par-align.png differ diff --git a/tests/suite/model/cite.typ b/tests/suite/model/cite.typ index 90280081..b328dda4 100644 --- a/tests/suite/model/cite.typ +++ b/tests/suite/model/cite.typ @@ -114,6 +114,28 @@ B #cite() #cite(). #show bibliography: none #bibliography("/assets/bib/works.bib", style: "chicago-author-date") +--- issue-5503-cite-in-align --- +// The two aligned elements should be displayed in separate lines. +#align(right)[@netwok] +#align(right)[b] + +#show bibliography: none +#bibliography("/assets/bib/works.bib") + +--- issue-5503-cite-group-interrupted-by-par-align --- +// `par` and `align` are block-level and should interrupt a cite group +@netwok +@arrgh +#par(leading: 5em)[@netwok] +#par[@arrgh] +@netwok +@arrgh +#align(right)[@netwok] +@arrgh + +#show bibliography: none +#bibliography("/assets/bib/works.bib") + --- cite-type-error-hint --- // Test hint for cast error from str to label // Error: 7-15 expected label, found string diff --git a/tests/suite/model/enum.typ b/tests/suite/model/enum.typ index ed33157e..c5e56215 100644 --- a/tests/suite/model/enum.typ +++ b/tests/suite/model/enum.typ @@ -163,3 +163,15 @@ a + 0. // Enum item (pre-emptive) #enum.item(none)[Hello] #enum.item(17)[Hello] + +--- issue-5503-enum-interrupted-by-par-align --- +// `align` is block-level and should interrupt an enum +// but not a `par` ++ a ++ b +#par(leading: 5em)[+ par] ++ d +#par[+ par] ++ f +#align(right)[+ align] ++ h diff --git a/tests/suite/model/list.typ b/tests/suite/model/list.typ index aa117672..138abf70 100644 --- a/tests/suite/model/list.typ +++ b/tests/suite/model/list.typ @@ -218,3 +218,18 @@ World part($ x $ + parbreak() + list[A]) part($ x $ + parbreak() + parbreak() + list[A]) } + +--- issue-5503-list-interrupted-by-par-align --- +// `align` is block-level and should interrupt a list +// but not a `par` +#show list: [List] +- a +- b +#par(leading: 5em)[- c] +- d +- e +#par[- f] +- g +- h +#align(right)[- i] +- j diff --git a/tests/suite/model/terms.typ b/tests/suite/model/terms.typ index 07aa827d..61fe20b0 100644 --- a/tests/suite/model/terms.typ +++ b/tests/suite/model/terms.typ @@ -75,3 +75,18 @@ Not in list --- issue-2530-term-item-panic --- // Term item (pre-emptive) #terms.item[Hello][World!] + +--- issue-5503-terms-interrupted-by-par-align --- +// `align` is block-level and should interrupt a `terms` +// but not a `par` +#show terms: [Terms] +/ a: a +/ b: b +#par(leading: 5em)[/ c: c] +/ d: d +/ e: e +#par[/ f: f] +/ g: g +/ h: h +#align(right)[/ i: i] +/ j: j -- cgit v1.2.3