From f7bb5f72c5a580589455a87b41bf2a7eefdd7421 Mon Sep 17 00:00:00 2001 From: mkorje Date: Wed, 18 Dec 2024 00:20:05 +1100 Subject: [PATCH] Change default value to `1em` --- crates/typst-library/src/math/equation.rs | 2 +- docs/reference/library/math.md | 2 +- tests/ref/math-align-columns.png | Bin 1407 -> 1401 bytes tests/ref/math-equation-align-columns-1.png | Bin 1950 -> 1945 bytes tests/ref/math-multiline-line-spacing.png | Bin 474 -> 459 bytes 5 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/typst-library/src/math/equation.rs b/crates/typst-library/src/math/equation.rs index 137ebb9b7..e60c055ad 100644 --- a/crates/typst-library/src/math/equation.rs +++ b/crates/typst-library/src/math/equation.rs @@ -18,7 +18,7 @@ use crate::math::{MathSize, MathVariant}; use crate::model::{Numbering, Outlinable, ParLine, Refable, Supplement}; use crate::text::{FontFamily, FontList, FontWeight, LocalName, TextElem}; -const DEFAULT_COL_GAP: Em = Em::new(1.5); +const DEFAULT_COL_GAP: Em = Em::new(1.0); /// A mathematical equation. /// diff --git a/docs/reference/library/math.md b/docs/reference/library/math.md index ac9c03ddb..c632b286f 100644 --- a/docs/reference/library/math.md +++ b/docs/reference/library/math.md @@ -78,7 +78,7 @@ alternating the alignment twice. `& &` and `&&` behave exactly the same way. Meanwhile, "multiply by 7" is right-aligned because just one `&` precedes it. Each alignment point simply alternates between right-aligned/left-aligned. -By default, there is a gap of `1.5em` added between columns. You can modify this +By default, there is a gap of `1em` added between columns. You can modify this with the [`column-gap`]($math.equation.column-gap) parameter. ```example diff --git a/tests/ref/math-align-columns.png b/tests/ref/math-align-columns.png index 8420ae315385954c72a71fc503728ae024bb8062..fabfba8a5fc3796ca6e735019989e306d7b3fdcc 100644 GIT binary patch delta 1382 zcmV-s1)2K)3i%3%3C|K5i1SWwPp@@EZm}n=4ZX4hvQ96O)VCr^o5o3%_WEb4`FM2 zd;1_#qlSO=BW4#Kc6%z^zjklwxgZl_^;7fJIev)sejBXLUozmKF#dl+>M6v!-owlV zq@#6^=dq7^HjopFSi#PLSjMEIGwj9MF;9i7)&cvjNPpf=yCbp=BG4%udL5&_=_|lf z;kXnq&Km-ZJ%S+w^SgN3Q483591z4MQ17|0|6|5?)d7^}2z~=Fc!M>{4(M|n`TqGSjMI3J(CC~gm2rdA9Z%*>dWj~-yn~6m9 zc{q9!w$#AJo3La67PVsa2HRU^(P+&wfJ)cHxqUEIy0M=YJ}&`pE5-#+81Mz%+!1QF zK&7vEzEvCEWc;Z^j6f1^AT)=W#l4rOv=H)6ks z19~RLOKa~8 zbUA!D8@fM4V$RTT?`=C1(ld`9N?i_r+y+m50E5QC0?_t$;Z`F!*QycRLr}P;YCpId zHq8Z82Z8=t2P;5Ms38U;&UMxb9wFF!qJJXV^>A4L*gtIs+EflEfIu}P#tS%CrxIL3 z@V*{{>){{I(Y*5kfZ5;xV4gKdS5P0$jT!`w3EdpP<#1JMMpmH_3Dp^8=9ybe$WT`1 zHTmX}!*W;-%i&iQuIfYLnMR{|j&qjstj1^K?uN(bl_SwJ`%&|ulQ{EuTeUgM7k_ud zs(=C{x|TxOHk{~QI1HBU?uOfoeoh7$F$e|_6ohE=!gRbKert!M0z7p$tmsOJ0=TOZ z+(589`|;(?Hu15m1i9nDI}Hfj3~Tb$#{vMfwSqWJNl&`_PaP9$Mc@tuO4_~=zYsHzE zM3nA^gGxXhiFjj+aKw2%PB-?y4{nCbr(G+Gi9>8CesNhz><>6|^NkX>!}_*1oec>~ oo4|}SI=xQ5x#X}MmcuX6KfOIEtZFmY`2YX_07*qoM6N<$f|Uu5XaE2J delta 1388 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 literal 1950 zcmV;P2VwY$P)L29 z5h!Dy^jte6hvTDL73Rj`2akdCt?2(40E+!jK&fQSR&c9I@DYHvMLYVT&;=KFa2H*X zeMM>R-sg{ldlko*iC6ZD5-2n!9o&q*`cJ{su1@ZSGHboS{Sis{+*z{=5>G7IWq_z~ zMFo_|4uixGfo1&X7_k{jT%BbFwb=u?KuS6^X{*& zL1H(S)IwSAN?+-(xd};yjyZ_owRrYQKRIx1IwlFj6Xw1)Mr*a&_tfv-YHl^Rn)_blUK2W?6?DlC@2f#}$l-Z9CAaUW z{EjL=G$2R|4Zi5>JIrHeZ{OmSiFk2&rIQljQF+V?{kKgBkixVx7oWT%gkNp^A z?!z?>&*gK&4TB|WQs7kghL9$3^6x7~FNK3?;PQj>F;qe>2D$ah>)qgn$$e0N1vql> zP$?L%G4&WwueX3PuZ_42IL}?3a~h~KR^@<+xIYh)rr8Bu03hrPJ_tC^ecez9wCiiP z+5q6>Lkr=caKCKs=u*rzrKM;7*$SrP#drI_6@^(|1%ND{8-PsieSaaOvO2hKf%snd z_!$$pErI<$0Iq&=0+7jVo`a(+1^1rmEdaA#yBm@Prz4Nc<$l?Q=!Cd^`RgI7d>|Fv zL`$1D0Q6_BJS>-c<|*VaERJlQ2T|+T0B}An)(HS`a#fm5CU@#;;Dx>~F|!w{1){E*?cio%&vNmq z58c%5G`D^cI>$q|vknji6oQLMhtT0Pcfl)_72(?!^%s8P6Ws&G;?V&~SV2ID^!ZU% zgdwV4(>DiZ&A(}y{M~93nEu%fkRNUm2iCdkrn%}pw1M_h{3*cE~6t!BAOPsg|soVx~X8=5d? z*0J|%SN=Fz>kTsNq`+7ve6jmOE>=SB_|O3+&}BHhKLxTHhvymU?+t2hHMg2u&8_BE zbE~-t^%bG7A{12Q+=Tjy(pQlSDr#<8eMRr9=mix$H@Utd_f>>~ijbRJUy=JNLP2$R zxykhvxv!Ebs79EZTwhW9Dw%?6gt^J}6}hjHDX2!6n_OQ}`zpDDYNWZz^%b?Rk}0T0 znwwl-QTr;Hf@-9>$@LYruaYUKMwXjgUs3xinSzRtn^0d-`YLikMa@m9uPA*LwV+bJ zf2+CG+-mN7mYXmepzH*w!vJz_`fPx{6QB=jpb%+MJL5Y(SFjUcxy${~HQDM4 z*W1Gk18BKlup>G)KSXy**=)cKpVh!P@5-E{Yy~?3mOCjFcn;t13YQ-S&~s14&&PyW zXETeN1ZA^p`l+NQ8F8- zipqf@B@cPaBEC;kuoEz^i?i2k-`Ll>Soh09nPC7uw`74GC8?CzfPW{hEhFp%vJ4P@ z7;YFq&wYK*-UFoBfHixs!A98$lw@bM$_xVtxe2oY!cKrX44~#F%myes0qQV7{T{34 kR&%Sl)!b@sHTTHjA2GG;u`!CnApigX07*qoM6N<$f<>sa&;S4c diff --git a/tests/ref/math-multiline-line-spacing.png b/tests/ref/math-multiline-line-spacing.png index 468e92f2b2594d8a26281d90b4cfb17d11f21034..7d4447893d0567373a45666e5e946fb05ff56b8d 100644 GIT binary patch delta 433 zcmV;i0Z#tf1Iq)DB!7}gL_t(|+U?i7OG057$MOD|wupwJp@yQOsYZvQsmqYm&;<>r zf*{bzK#{Phv=EW73nWBP7GZ-?B3S9MFg3f7l!3SWg`3YAba=}Mp6~X)9Qg2X;Dx6K ze^d>_3^UAd6=914m7AaVd3axk${FpVuw=U_fHbpuNN*&EAAht{o8n0j_Ky}CUjewa z#f$*Z5wJT^(uq1f0Kl&;rpo}>G^83J2rInk1S#DMgB~R{Nhp9+mkExF!mWkNaUYpD zGL4=PN@@mTWa4xOOtvdQcxhL!bc3{DvXZmOwR0f*!l{}K@&m#!!wfUbFvAQp{6FEW zW(?)Z4Y_^?-hVKAP`1G^#Np@T9B8q=6>{}(o(HY{!Yd4KEhd)f3WH?JEnVV#?R15S z)Jv*6QMhh*~Fm{l$30R!A>V0ma^SpK^T+Q)-%u? zCUR6C)h9seLUd?d6vjPdy=ln*%OlkV+6NH*5{Bhv+A6fL$%@fw#00000NkvXXu0mjfbRo@k delta 448 zcmV;x0YCoB1KIj#6lbt6S1-+jWTI)NCHDBAq}ZPNxjqxQ9 zG7MuF!x-*XxZIa&(|qhLb#&vAX1nH~l#P$$MH1BI(LAm3p??F8B<#LdFCjd88=MCK z&a(bJDF8TSV4U`t%vKx#96wqN02+$gl23d%Jqq>!iIx-4LwO-J@Fa1XKwS_YJ~DwK z{X%T4c}q-E-p(#?MPg%PjF+dxhpQ`orGrEfkAbDUqWN;WPLLa$Tjj?Cf?*6}7{eIG zForSw|H3|9vVXM{AM1Qre#f?!@)Od+&FicX#rkuU#$A=0Byn3KRSDs`F1tZKVE|l< z6{^eRrw)l9deB%|Mnc#=7YqxT<%H7qjG!u#XaF)Z62jVh;F^Ms)z6f+5aow}*!W2e z=5S7Y_{^2u{1mWZTDx$r=}F>sg4XjOJ`9yt0jO1`X*rAgumwo+&O@Wn(a&j>$x^JO qJU9IQ0jU8!brx?mhB1ucF3uOYfza79xi;wl0000