From aa38b96849e2c8a8d7a462789e1f81e9f65d45b3 Mon Sep 17 00:00:00 2001 From: Leedehai <18319900+Leedehai@users.noreply.github.com> Date: Tue, 7 May 2024 09:46:18 -0400 Subject: Fix: `number-align` should align line/number baselines (#4024) --- tests/ref/math-equation-align-numbered.png | Bin 1314 -> 1298 bytes tests/ref/math-equation-number-align-end.png | Bin 1541 -> 1519 bytes tests/ref/math-equation-number-align-left.png | Bin 1526 -> 1511 bytes tests/ref/math-equation-number-align-monoline.png | Bin 0 -> 1379 bytes .../math-equation-number-align-multiline-bottom.png | Bin 758 -> 1318 bytes .../math-equation-number-align-multiline-expand.png | Bin 510 -> 518 bytes ...th-equation-number-align-multiline-top-start.png | Bin 597 -> 1302 bytes tests/ref/math-equation-number-align-right.png | Bin 1506 -> 1496 bytes tests/ref/math-equation-number-align-start.png | Bin 1528 -> 1514 bytes tests/ref/math-equation-number-align.png | Bin 1541 -> 1519 bytes tests/ref/math-equation-numbering.png | Bin 4604 -> 4600 bytes tests/ref/outline.png | Bin 40746 -> 40846 bytes tests/ref/ref-supplements.png | Bin 8276 -> 8267 bytes tests/suite/math/equation.typ | 18 ++++++++++++++++-- 14 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 tests/ref/math-equation-number-align-monoline.png (limited to 'tests') diff --git a/tests/ref/math-equation-align-numbered.png b/tests/ref/math-equation-align-numbered.png index e43054c8..11d4b3b1 100644 Binary files a/tests/ref/math-equation-align-numbered.png and b/tests/ref/math-equation-align-numbered.png differ diff --git a/tests/ref/math-equation-number-align-end.png b/tests/ref/math-equation-number-align-end.png index f60a15ec..857d56f6 100644 Binary files a/tests/ref/math-equation-number-align-end.png and b/tests/ref/math-equation-number-align-end.png differ diff --git a/tests/ref/math-equation-number-align-left.png b/tests/ref/math-equation-number-align-left.png index a8ed40a5..ec6cfca0 100644 Binary files a/tests/ref/math-equation-number-align-left.png and b/tests/ref/math-equation-number-align-left.png differ diff --git a/tests/ref/math-equation-number-align-monoline.png b/tests/ref/math-equation-number-align-monoline.png new file mode 100644 index 00000000..681997d4 Binary files /dev/null and b/tests/ref/math-equation-number-align-monoline.png differ diff --git a/tests/ref/math-equation-number-align-multiline-bottom.png b/tests/ref/math-equation-number-align-multiline-bottom.png index cb0e5daa..08c80f97 100644 Binary files a/tests/ref/math-equation-number-align-multiline-bottom.png and b/tests/ref/math-equation-number-align-multiline-bottom.png differ diff --git a/tests/ref/math-equation-number-align-multiline-expand.png b/tests/ref/math-equation-number-align-multiline-expand.png index 3c3cdc05..b6546433 100644 Binary files a/tests/ref/math-equation-number-align-multiline-expand.png and b/tests/ref/math-equation-number-align-multiline-expand.png differ diff --git a/tests/ref/math-equation-number-align-multiline-top-start.png b/tests/ref/math-equation-number-align-multiline-top-start.png index 43346de9..6a3dad50 100644 Binary files a/tests/ref/math-equation-number-align-multiline-top-start.png and b/tests/ref/math-equation-number-align-multiline-top-start.png differ diff --git a/tests/ref/math-equation-number-align-right.png b/tests/ref/math-equation-number-align-right.png index e3d588c4..63daed6c 100644 Binary files a/tests/ref/math-equation-number-align-right.png and b/tests/ref/math-equation-number-align-right.png differ diff --git a/tests/ref/math-equation-number-align-start.png b/tests/ref/math-equation-number-align-start.png index 67ed3c4c..769f3b82 100644 Binary files a/tests/ref/math-equation-number-align-start.png and b/tests/ref/math-equation-number-align-start.png differ diff --git a/tests/ref/math-equation-number-align.png b/tests/ref/math-equation-number-align.png index f60a15ec..857d56f6 100644 Binary files a/tests/ref/math-equation-number-align.png and b/tests/ref/math-equation-number-align.png differ diff --git a/tests/ref/math-equation-numbering.png b/tests/ref/math-equation-numbering.png index b1e6b10e..3210da23 100644 Binary files a/tests/ref/math-equation-numbering.png and b/tests/ref/math-equation-numbering.png differ diff --git a/tests/ref/outline.png b/tests/ref/outline.png index e5c24a98..71dd6e1a 100644 Binary files a/tests/ref/outline.png and b/tests/ref/outline.png differ diff --git a/tests/ref/ref-supplements.png b/tests/ref/ref-supplements.png index 46d1524a..3bd8a30f 100644 Binary files a/tests/ref/ref-supplements.png and b/tests/ref/ref-supplements.png differ diff --git a/tests/suite/math/equation.typ b/tests/suite/math/equation.typ index dd2745d1..d5771f95 100644 --- a/tests/suite/math/equation.typ +++ b/tests/suite/math/equation.typ @@ -152,6 +152,16 @@ $ a + b = c $ // Error: 52-67 expected `start`, `left`, `right`, or `end`, found center #set math.equation(numbering: "(1)", number-align: center + bottom) +--- math-equation-number-align-monoline --- +#set math.equation(numbering: "(1)") +$ p = sum_k k ln a $ + +#set math.equation(numbering: "(1)", number-align: top) +$ p = sum_k k ln a $ + +#set math.equation(numbering: "(1)", number-align: bottom) +$ p = sum_k k ln a $ + --- math-equation-number-align-multiline --- #set math.equation(numbering: "(1)") @@ -163,13 +173,17 @@ $ p &= ln a b \ $ p &= ln a b \ &= ln a + ln b $ +$ q &= sum_k k ln a \ + &= sum_k ln A $ --- math-equation-number-align-multiline-bottom --- #show math.equation: set align(left) #set math.equation(numbering: "(1)", number-align: bottom) -$ q &= ln sqrt(a b) \ - &= 1/2 (ln a + ln b) $ +$ p &= ln a b \ + &= ln a + ln b $ +$ q &= sum_k ln A \ + &= sum_k k ln a $ --- math-equation-number-align-multiline-expand --- // Tests that if the numbering's layout box vertically exceeds the box of -- cgit v1.2.3