From 53c306e32cd9622f7f2af66e08b6846712e78633 Mon Sep 17 00:00:00 2001
From: Leedehai <18319900+Leedehai@users.noreply.github.com>
Date: Wed, 22 May 2024 13:04:46 -0400
Subject: [PATCH] Fix equation resizing when adding the equation number (#4179)

---
 crates/typst/src/math/equation.rs             |  24 ++++---
 ...equation-number-align-multiline-expand.png | Bin 518 -> 1250 bytes
 ...ation-number-align-multiline-no-expand.png | Bin 0 -> 1050 bytes
 tests/suite/math/equation.typ                 |  67 +++++++++++++++---
 4 files changed, 72 insertions(+), 19 deletions(-)
 create mode 100644 tests/ref/math-equation-number-align-multiline-no-expand.png

diff --git a/crates/typst/src/math/equation.rs b/crates/typst/src/math/equation.rs
index 947f01f2..d6a8d4c7 100644
--- a/crates/typst/src/math/equation.rs
+++ b/crates/typst/src/math/equation.rs
@@ -466,25 +466,33 @@ fn resize_equation(
     if matches!(number_align.y, FixedAlignment::Center if is_multiline) {
         // In this case, the center lines (not baselines) of the number frame
         // and the equation frame shall be aligned.
-        let height = equation.height().max(number.height());
         return equation.resize(
-            Size::new(width, height),
+            Size::new(width, equation.height().max(number.height())),
             Axes::<FixedAlignment>::new(equation_align, FixedAlignment::Center),
         );
     }
 
     let excess_above = Abs::zero().max({
-        let (.., baseline) = first;
-        number.baseline() - baseline
+        if !is_multiline || matches!(number_align.y, FixedAlignment::Start) {
+            let (.., baseline) = first;
+            number.baseline() - baseline
+        } else {
+            Abs::zero()
+        }
     });
     let excess_below = Abs::zero().max({
-        let (size, .., baseline) = last;
-        (number.height() - number.baseline()) - (size.y - baseline)
+        if !is_multiline || matches!(number_align.y, FixedAlignment::End) {
+            let (size, .., baseline) = last;
+            (number.height() - number.baseline()) - (size.y - baseline)
+        } else {
+            Abs::zero()
+        }
     });
-    let height = equation.height() + excess_above + excess_below;
 
+    // The vertical expansion is asymmetric on the top and bottom edges, so we
+    // first align at the top then translate the content downward later.
     let resizing_offset = equation.resize(
-        Size::new(width, height),
+        Size::new(width, equation.height() + excess_above + excess_below),
         Axes::<FixedAlignment>::new(equation_align, FixedAlignment::Start),
     );
     equation.translate(Point::with_y(excess_above));
diff --git a/tests/ref/math-equation-number-align-multiline-expand.png b/tests/ref/math-equation-number-align-multiline-expand.png
index b6546433132338c62a329c4e31eb712f9d34fc38..f3e67c2300052f3314970806337f951ca4806584 100644
GIT binary patch
delta 1243
zcmV<11SI>01mX#h7k|PC00000r(Rhd000E3Nkl<Zc-rmTT~8EO9LI5AKwm@?Nqk6c
zYPCKjT6-bI#$Z~6b}uS@P+FB>ty>;cgn~d>N|EhSmMtzUkK$S^2o%Z!6_5sZ+1+8?
z2X>j?Ws_bQE}HbgYOpzTH+XTHoSi*L{@<IEoMiLK?8VHPIe#;oo=R#H!2}aba1vk`
zTij^^q`>|ia$w*&g;h&6Ys^=z<r~umi@M>CSiD5do{9jSKnSLbL{f5BjX?(NZVm1l
zl>s-FBCk>c%-T00=OS^{4k<_6-GkdQ;GykD4m)JPevii!l>uuJEC?4lCBc{4QUgE0
zn%?xPDS#*QzJGm(jm~;j9{@G&=E-H_;k`a@CL0wmD+FNZ6ima0!^$q$sucj&N?1++
zU)%7~qTw*IBk4A`Zsv#Yn#v&n|IdE+tjw&LTJX|hkKm04KmJG3f<C(v{1Oh^Wi`q0
z$D`oa_b&Fkh2S>pT4zts4e*OZc1A_uGF#{s=+4!_-G56Tc)`townP<xm($ccpFmgJ
z6{L@YS3HiRb^%y9jH1>--4QpmE3bjuIWtUV0T|^i=Zf#^X1tXbX25OYo0=m*0a&0o
zt*Z$(EJ=@zS+o!!m|%hlUhnX#oUH-)vmghqIw%LeIVuLLTF;E!LM;!3V70E6HRh|;
z@{MUj9e-agv^8vZ%lNCq%Fp{FGGN3n=5*4Ti(uM62LDciZraunyo`h#_=O#&gcP`9
z5s(6(X?G?Y{_rb+-#Fg8n`Ah@AN<_CFjoq}6P*$0JM`l(;MR2uCbtOu{iWHL^-pi3
z+kCkp@PAlW4-t54Y~p?B>NO*C#PAbH@O50ZO@Hc+xXu~h5jPyhr#(4Ele(F^<ppk}
z;BnI*Pybpo^Y;^42oSu{U{6%i-s1U2NlTyO_fi2zOD$FU_du|vqbdb(&T#mU{>_(}
zW5}HVw}m?EvH%?2impNc7$0Cw18A~f@2}t$&j=R`h`^aJxw-+|xxpF-;AkJu0yo>~
z0e=MoFuGe@wNc$ntl6>zZfA~8o91M!G7GMt@`4Pw@pDuZ%7B+lgU9d7fDs#t&}}O1
zEfP#H!2}bm^(X#){6xmpsc-YPEm<<)E}%iui)52_2*7Hmi#4OTw3Hcb=v2Y)L|g>M
z+$<}cnAJ*zwP6nYVzRzX9X%jv1@fDV&VO74uTyyCA?wlVL#@?E+OU#>y+wzeH5IUH
z1*WvYL3@h?Z!mb?F9|+T1Mq9MTapdudcd!*5%ysr*jnEUeLK6ZgIn;$>*lZse7-%h
zTfevHJD}#?12=Qp+i?Lnk%s<!0Eov}2>`8M;*Cl0a`Y_aS_R-x1`3@00Bq%~4u1ev
zm-isJeKw8RVgVTSEoG$v-Hc)>@qybyiKQq+3ju=ZeJ)PLZIZ4|mz}ABBUn>LN<MC%
z%Cly%vF#em4M5%8cWT*qc%RRg$;QAuYZ1WkNti|qhm}{+RJHib$L)&YFtVfRO>W)H
zt>)%37!S{P_<Nympr6*&>j{qKSyc0-z!jw^Y?lF_twGrrB5+`V6;l_q)R;B|z-{oO
z*juNiJP{bN<=4pgtADD%v7ih%a<Sw#?WPh;Fu~6?{2wW)<A!3wWhVdt002ovPDHLk
FV1f{@Typ>b

delta 505
zcmV<V0S5l!35Eoa7k^g>00000>h<330005aNkl<Zc-rmQ-z!659LI5gjtfdIBq_#?
zv|MnbNJ*|xLT0-W*=oqtXjj~DVaTLmnGMUY&hdM8X0wk={sEUl=ec`IE#^7jR^Ru{
zQ|IQ@bLyPFeM`QGDq)ymh8g|`7;4KbwF4yZbvX?T6f5j^n}2PjJ>ra?x<wB~d1JL@
zJyjDo6tIY4hKmH&x=v|e*wU83sTAa%>Tj)p=cZhv01S^P1|Zn5-LD=#uf_Bn0Nmf1
zWdRJWqD(zJKaAFx0T|9PvjYJ3WUNj-yze?FU&u(0hOWBz{s8~BbP_M}lh61okGBjn
z%rL{&z))Ox`hOS{@K)fm@{j_aaiDjS05+?M6aeSEZnKE)7U>ajcyq{~*9Vdt2bZx!
z0Y@s@S^^Z`@tdye@BHUtm|=z)CK`P-dxB`|Q}=8Me0&DERO9}$1+X(P*#~I{veI<X
zr5=vkFtrG&flZXEhkXv%V~_II$JlLF4<C)JRnE$z-E#PDM?yUe{qpu2a)$=*tA8v(
z178e=sx=BY>Oggv0!Gr`gF@i#pjkY#E>7(xC^C?@rwzMS2z(MX({fSKLn<oDB442p
vI-L}++U0}IPcaC5gcnzM^kJA`hX12)9j6udfD-Ri00000NkvXXu0mjfl3VWI

diff --git a/tests/ref/math-equation-number-align-multiline-no-expand.png b/tests/ref/math-equation-number-align-multiline-no-expand.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca451d1912b06fd16ddd0d1a0e65b1aa234dff21
GIT binary patch
literal 1050
zcmV+#1m*jQP)<h;3K|Lk000e1NJLTq004LZ002D*00000Lz?o@000BwNkl<Zc-rll
z{Yw*Z9LIA}_FzTyLj^q$F(~K(ioy_yK*v%uvImV~Shi9OaXlc@+N|bMdeCL2_N*%-
zx1up|`8ZQcou+fs&3X6vTWUM+c6a!h+w?++d;fCB=LMgapPirMyDj;%NLeC^MX@Lr
z#R7=IAG@B4*F;^aA&?nTO;t=@Jrz3(;DF>@jz5a@#I-RG0a)@bMj8N@Gn02qwh%Nx
z#duhP1KY}Uy5KP+^2n(btu*O4^Fnwr=wco*C7YE?Tsx#5hCBfPhrnWx$93Vv5__Ig
z?MfC}Jho-;6i!McFW9OsQD`wVFH?pf$JX~Vw=aK&7f+F)#2y^nT>2gt4{th50G0kG
zcUW;nd0{!)f8=tFjKlybHR57;nm~)y<yvXO+~O`7l)OQ^WPBqNQBbA>T<nxPfl1$y
zFcWJZfNT&QObV8(;|OTH2Do_oL=Q0W-79LGTij6j{opfvVp36FKO3}VkjzK!;1fkN
z&>4*61@g7k(u<16-i*E_X90(Nf+-dD@QAuH=*^Ap&E*>jzfPW%Uo)#PP?vB7pu0Cn
zY76NH-Il-MQ&eJ;qA0vLGj?4daT0$XLqUr=mnNO7*HUD;A8d!{Ca#G<%+K9HV=6}e
zxfo1Y9g8FO6yKhY*geLE;ED+jaEBI?Dq=WpdLH6KlI$D)6e!X*OG*Lsc?8|xDA^SN
zs;g(?mu>Wg6cY(#)4usk+`T4=`P&<gf~BgeiRp52`4?s<bE-m$p|?&wIv+7q`Uj<B
zZ{e-$uI=N&M-T4r1h2iP);xqied{xOL}EC-q80xiYFm}g&Q)3;@8Gsi8`9iC#YUBH
zXJlgcPU$2n20eSW(iB5>8K?d0OQ5u(;sYa2d1PX+#-7K;kQzK&d0Zg>$Z20{fOs2$
zi4Q{Eoz}?2ppn$#V&}HKKIZ<DlH0zwq$<sTPON=(Bflj=G3++uVyKiccRgC@i}IKj
zUaU5R=;Am&!JL6obeiWvi)&ROx_D9sm|BZgs~r$n{4ERU`1<)>GOfW6ngIfe`%}F@
zN68l#ykx+ST;atonS=DlH)N~WbClQRaWNT)tEc(GYP0a-3+vg`aJzJFWWjzeu$Kj*
z_nN3H@0%@EF?sdWm3ncCzX*gnf#{M_jDQmJy&@+HGLq!-_JxZZ9e|2|C&R;b{IJ*F
zb{!ThuCUZkqvHG7)y*h?NqFj5xcIZvrbPQIv*3yuUmBMRq7tLK@e0VT=x*d_K$nlN
zlhyzWpEwJ~_W(vd<Uw&6KJnR)0*JrV<XZtHxAb{axcFoTfcTT5C>F({_`ekY1=?A&
Uhk`aiQ~&?~07*qoM6N<$f&?b^4*&oF

literal 0
HcmV?d00001

diff --git a/tests/suite/math/equation.typ b/tests/suite/math/equation.typ
index d4fba36b..e7ae677e 100644
--- a/tests/suite/math/equation.typ
+++ b/tests/suite/math/equation.typ
@@ -194,22 +194,67 @@ $ q &= sum_k ln A \
 // numbering's layout box. Note we use pattern "1" here, not "(1)", since
 // the parenthesis exceeds the numbering's layout box, due to the default
 // settings of top-edge and bottom-edge of the TextElem that laid it out.
+#let equations = [
+  #box($ - - - $, fill: silver)
+  #box(
+  $ - - - \
+    a = b $,
+  fill: silver)
+  #box(
+  $ a = b \
+    - - - $,
+  fill: silver)
+]
+
 #set math.equation(numbering: "1", number-align: top)
-#box(
-$ - &- - \
-  a &= b $,
-fill: silver)
+#equations
 
 #set math.equation(numbering: "1", number-align: horizon)
-#box(
-$ - - - $,
-fill: silver)
+#equations
 
 #set math.equation(numbering: "1", number-align: bottom)
-#box(
-$ a &= b \
-  - &- - $,
-fill: silver)
+#equations
+
+--- math-equation-number-align-multiline-no-expand ---
+// Tests that if the numbering's layout box doesn't vertically exceed the
+// box of the equation frame's boundary, the latter's frame size remains.
+// So, in the grid below, frames in each row should have the same height.
+#set math.equation(numbering: "1")
+#grid(
+  columns: 4 * (1fr,),
+  column-gutter: 3 * (2pt,),
+  row-gutter: 2pt,
+  align: horizon,
+  [
+    #set math.equation(number-align: horizon)
+    #box($ - - \ a \ sum $, fill: silver)
+  ],
+  [
+    #set math.equation(number-align: bottom)
+    #box($ - - \ a \ sum $, fill: silver)
+  ],
+  [
+    #set math.equation(number-align: horizon)
+    #box($ sum \ a \ - - $, fill: silver)
+  ],
+  [
+    #set math.equation(number-align: top)
+    #box($ sum \ a \ - - $, fill: silver)
+  ],
+
+  [
+    #set math.equation(number-align: horizon)
+    #box($ - - $, fill: silver)
+  ],
+  [
+    #set math.equation(number-align: top)
+    #box($ - - $, fill: silver)
+  ],
+  [
+    #set math.equation(number-align: bottom)
+    #box($ - - $, fill: silver)
+  ],
+)
 
 --- issue-numbering-hint ---
 // In this bug, the hint and error messages for an equation