From 6d35972c3d2caaea3d6e358f6af121ba37881dbb Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 26 Nov 2024 12:36:53 +0000 Subject: [PATCH] Update NewCM fonts to version 7.0.0 (#5465) --- Cargo.lock | 2 +- Cargo.toml | 2 +- .../typst-library/src/text/font/exceptions.rs | 3 +-- tests/ref/math-attach-descender-collision.png | Bin 739 -> 737 bytes tests/ref/math-attach-horizontal-align.png | Bin 1898 -> 1899 bytes tests/ref/math-attach-nested.png | Bin 979 -> 981 bytes tests/ref/math-attach-postscripts.png | Bin 497 -> 496 bytes tests/ref/math-equation-numbering.png | Bin 4684 -> 4699 bytes tests/ref/math-style-greek-exceptions.png | Bin 301 -> 315 bytes tests/ref/math-underover-line-subscript.png | Bin 1541 -> 1540 bytes 10 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 78ab71c59..330dcce5c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2677,7 +2677,7 @@ dependencies = [ [[package]] name = "typst-assets" version = "0.12.0" -source = "git+https://github.com/typst/typst-assets?rev=5c0dcc0#5c0dcc062eddd9c1b1a8994fe4948ab604a1690f" +source = "git+https://github.com/typst/typst-assets?rev=8cccef9#8cccef93b5da73a1c80389722cf2b655b624f577" [[package]] name = "typst-cli" diff --git a/Cargo.toml b/Cargo.toml index cebc2e972..1f6eb5acc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ typst-svg = { path = "crates/typst-svg", version = "0.12.0" } typst-syntax = { path = "crates/typst-syntax", version = "0.12.0" } typst-timing = { path = "crates/typst-timing", version = "0.12.0" } typst-utils = { path = "crates/typst-utils", version = "0.12.0" } -typst-assets = { git = "https://github.com/typst/typst-assets", rev = "5c0dcc0" } +typst-assets = { git = "https://github.com/typst/typst-assets", rev = "8cccef9" } typst-dev-assets = { git = "https://github.com/typst/typst-dev-assets", rev = "b07d156" } arrayvec = "0.7.4" az = "1.2" diff --git a/crates/typst-library/src/text/font/exceptions.rs b/crates/typst-library/src/text/font/exceptions.rs index 6393df4b2..465ec510c 100644 --- a/crates/typst-library/src/text/font/exceptions.rs +++ b/crates/typst-library/src/text/font/exceptions.rs @@ -182,8 +182,7 @@ static EXCEPTION_MAP: phf::Map<&'static str, Exception> = phf::phf_map! { "NewCM10-Regular" => Exception::new() .family("New Computer Modern"), "NewCMMath-Bold" => Exception::new() - .family("New Computer Modern Math") - .weight(700), + .family("New Computer Modern Math"), "NewCMMath-Book" => Exception::new() .family("New Computer Modern Math") .weight(450), diff --git a/tests/ref/math-attach-descender-collision.png b/tests/ref/math-attach-descender-collision.png index 71654916b2686009c086630e874f1a0ca88d8cbb..fdca569552cffeab5d1118ac035ef09ee6e47f01 100644 GIT binary patch delta 713 zcmV;)0yh2Q1>psdB!8$$L_t(|+U?ifOH*MS2XOzE=rZW83n2^*BI>GLsE7%fX_$#G zD;vXvk@9MhSCVs|dPW(mmM z*uE$nJlm&UihIwdse!0+oQVL}u#zhX>>bnq!>y>%$382U??i=4HHS6HyG2BKhRtKT zrR5F=K&5N@=0;57Ftysy1OT0H0J!*tnIDBa`*Njf7=O5;vqagLXnIn+4o`F6e4s@K zbZYs91IyPvTW{9@1hN6FA<=3x@eA*0&GSH4j|SRT3@i;uw0`=9yiVRKhR`73r85_W zDNJDspICVHX+%K;_7tFq2n?yEkqCUCzvUzXJNgaD^;HL52(5s#iw$p9WbWO`*)P1Y zD>D32gMa=WOuPWZh5dQuUy5#9%kw_}JNhMif@i&54L;4|5B0P5`tO3kXc>Z{3#0Ow zBXbGbIOaUY?Z|S5Iv^U1bpIgmK;H{YO4T6|;dV(7SkEv5Nb44=#&_?nR+hP{i&tWM znG^tu0iektUISrA=WW0cs{%fGUqd`N{AdI~b3!)<=-Qo0HGxdq$iTkFMKbWi`Un}g v)(0|h0m#77YBKO)%}4qtL17A0I2qtSv9_165wTHf00000NkvXXu0mjfe#uue delta 715 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 diff --git a/tests/ref/math-attach-nested.png b/tests/ref/math-attach-nested.png index a62e62eb2e54ff7bea2b0eea8c12189caaa7a9a1..31b796fa2dc9fe41061881cc4f10edd156b7a86d 100644 GIT binary patch delta 959 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 M07*qoM6N<$f<(001ONa4 delta 471 zcmV;|0Vw|P1MvfpB!9R`L_t(|+U?alOIu+a$8q06q4XuRgG1*|U5ag?r5$Z?EVP4- zEv1F(rt%-6h>8m04OG0Ml3=0;YQ#G#QM{lDYECplRJ>nflCQ%d%JD?V0nx$pU7z8@ z4<4Q;i3cjlgiY9l?-f=`iCfgwc6vv!5(a&1LfpERhcnUT2Y>bq!j+bCbj?toQwChO z^Z8?d^_OiIwAOMnM=Inw{tsLjf!~}(h!wB_KroGrkmUpb_Xq&g{RHKq;}# z|GdWkost3!z_#Rmu3BvZ!22t0#X6G>0AuPogCB@gfaiUdDk8+HU3);7=hGS6!I~ zKKtE?9{!>L-8$Hwvc%XsVYb8Cn>eh@rNf4jdx|>MjZiNCGO@I9ADW!_iV}xi8LQA= zXdfWKoUPna4Gz1(C)2Yr86vTETbj3tTe!Gq=s`Y-`EB!CG~vexUjoFDOi&fl9JBxc N002ovPDHLkV1k^u-F*N6 diff --git a/tests/ref/math-equation-numbering.png b/tests/ref/math-equation-numbering.png index 7e8757bd1a2deb4788bda0fb5d2b30e4f0d36998..b127a9a1d8635178b4d58bfe788bf691878e15fa 100644 GIT binary patch delta 4526 zcmV;f5mD~UB-p*syo8B7z_)MiHza))-UX-*T^kBQ3zEOLWR%?l7Ett^3nR&uV24-@k0CE zR^GgM^Xkkl0|G-=YLMT-_qm@pyhSH6G${wGhKl?^wBVW&6s84I83`6s}&qn)SX*OicXak3Vt?xxRh-K79C) z!qcZuv!X*id-h}?I@gd^s#NLz{reO~j2JO?>{tq$Hf^H&DD2+7J18i~)-e9{*Izq! z>{z~hd5IDwq$VUJWb4+g46)0XFBd6NWX+m2etv%FB7d9M_vq21!NI}v=FR)ebh-U7Ipx3cH)V z_Uze%&EVi$wru(H&p+8TckWyc;_vUzR*XtuU|>>G()H`tmo8n(K{y)6WYe#|{>pW+ zqYO39mVd?^3Ui0vFIlqW{rmTHNZGPw7cN}LVOOqPDI=S6TeWJ{u3fwMyM%-UUtiw` z4<1aNI`!PSb8I!jE;QrxDD&?{ix%YwXoV9YoHJ+6f&~lSy?Zxi%$RcJ%2C6~iH+st z=HT5Dh8;e9 z7zLF>wQALhgGfsTID;T2CZ=iArYBFHv_-dT*RH2epXR^5`|i8Y(9q+@kN5B2-)ud5 z_H6m`<>^*V-rL)oZsp_|1fT*QYuB!2wq|tx{`>C*3l;<&~$++r# z`G4|(9M)*Vh7F+0j_cR2rvc}K{z-c_fdQvYd$8wn_&e+nV+*kB)vHG{GxD&R41$dt zH;x}ao|+mpYVgy!TF6P%tXUJyqtLEhJFbWEOMQh375qO4y>A+qE?t^$gBC`Z%cIS~ zg9lBeDS!u8OMzjCb^=42Hf>Ni{_FAM$A3nx`9_myL%~+qmm`>?(V@+nH8Wdp-n{AQ z=_&PM)oazN_4e&s3LYLFj7$D#`}XZ-cR5>NyLay%AhmAYnlT|p$SgY81;9p+9&HOD zN(>%M^Q;f}$zNcBWY$PaOEbqeHVI=U%RNR|4nc_2u3dZFxN#J?=2E3fNk^Eek$(|q zYjx>63S5Sae!$`18HE6`RIfE{PWM~B?=^e zEi!1(AP#O0OS8s}8{0w%RAQ{Ub?ZjK)zwvIV$2E3Wd6l~L|>yubUot+oG|j{R1wYr z8wjo=M~>tt!-anoOS5j>I@A;}WPgVK>8GD4pnTwDPR~pV9A8ckb)-t*luE29mob0-{8Oh+nU+{2cXxLt2`*#r-o5Na8>Tw0oH7?fB|BnBX^ACi z*|H_JrN;+hFb)_nVBo-k*dOLsGi+zgn&so;L*>q$JIx<4jWLFpo9XBuet-A@TaAif zEtnk*gvE;&2P%{U-J^C zu<@b8Cx;CmGE}fK_OAmw`b2?dg{#OBgf8Bpuw#>Nn5w=@tv~->@Qx9san16=rNPnx@KL# zj$QlNJu)hO;o?=mLx0Q5S7X`hN@Uzj-$i@E4%lHyVpNj-NO^{`P}rE!qR^sx_P0k@g&Rl$X!G1IJx|Y=7VwLZ0I&T3OOUR1GCV z1qC@im8#U@d+^XPV)3fE)?+J$bsM&NPny-Kb5B7+3@KVW(P!rVgC|L9xpEL@83 zwr-xsPDD_sT(!0X2-T2g3Bsbq%SpF}gdV~q=KoKz=o<+J!eJxEqf!(qR<4Pf4j(yT zbHGk?v_q#Jf`7z;@RJmlEL)2fo{P9vwp>+yas=8_Xx-L>V^VOb;A#t@n|s&oJNHol za%?OR^6pL1$_#|_7y5zOlxcIPPM?ROVEQ&}+SaG5A-}XX4JyF#5H;9;7r(P-i98pnGoHqYX;5eKH@?Zfr0Bb`i z$hs!mg-1U^s$mad_wL;-2_ZB$ zLhr>lHvmGwlX2m}=5ptVlOA(3BAE+63V&grK7FhQA$Mjl{Ro8ksTy`LAvvpGzrF)4 zw5YJ?g?a9y5OVp}gHTp6P+~!%Y5!zWR+#^10xbu;g0hgN0OydbND+vXED52IJ~0tG z^)CpOg8h)&d3lzWyJ8+Dq@#d@e#)v43hka#1;#E|--MP?Xuon%peQ_W;DBunR7b1K z7y8QAkwD@H>7fuH5+ai8=aY`8N}fw7gr64(?pV01?~GN2=a3LPzW*Q!q4k8mQzotTHJ;9@*;XlID1C!he9ePn-Dvgl0 z06tlWWre2Q^fE-ykgR_S12~4IFn9iPIBlg2r>zu(v_IXUq{e)pxP{z3B{fT-fjB_m z6_2A0*CoiAP*a>GtuYspmVXYwqyWdcSQrCAwmgvlQ3~)8vz^W)fX*UP3NL9 zKte7OzR@I1=-&OuP)h2d(BLf8bfeC6nXOgsw4a zX#))g>jUC`Njz!|2yrkm`DTsFCC&<{Ai}_;J8(bY+8ETN>gTd4aGn1IKVIIpZF_L= z4n9Fa!O6*wSoE{p-@G}XMva<@iAns7h`1OQwl6X=DmL~ecMde;4&=araBf1lJ=n4( z@ZrP9{Ny;))Bg17f3tysK`ANE)6!njn9rj}PuLm~63SLS9F|II5)$s>V<9jYVP24> zim0HJIcFw9qh|;Mm&p%BB%LjDABsOzZ`gl2{ob zg)iRn`gA6}FsBl^!<_VYUKR4-vlfN!f`}Y_z^0-QswjjCf1!#(sG<<6D1-{3ibANO z5N3$;gh!oDIyf(3JUl!)bm-vb=EkEXh0rO&>k;0cIB0;^i1;34MW7Laf>t5S1qh)4 zf4m)8J!U(E_`HZ~FV0Jj@Bf4#Ga@1apF~_weSLki9YStlA><7AQ~v??o6KV`F0_IYG`t$haXj0#v9(e~F-}gaP51h<_D1*6-g|ZsTA7=> zQ>RXLe>AdL)k4Se-bS#W;&RB!g@p`eoTv$cV4Mn}r>Cc52&IiRAcTsVKraG|Bmj(1 zDg53c9Y-~tG#8RjlIRvg(9TehAp$mpTM$YijLJ@hkoYfi`9yaRwZbBRZ_3n|HkQ0E zBsQvZ=gzVYbP|MKUS9TN!`&x&D!3z52=fqxjT$uy_#n)4w#i(12FpEz{XM9@^37Yq)3V+F zhkB2vrn9m8{Eu0nT#x^&UnauK)l5 M07*qoM6N<$g6ye~i~s-t delta 4555 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 delta 1490 zcmV;@1ugo7422AkBoE9za0f0j}>bp)D9>4i%R(gLN}Ql!$B zwlpxc#nO?sFs1FZw2AaOote@O)6Vs4JkN2S%s6qL>I;pT&&%_hnQwmc=A4`Ojog$7 zC&IvxRkC56%__MO(&`tJ5{Fc#h+kXMw^JLBlib@os1Urc9=V zCX-2ST;zgzp23s7t7Ocya;?d99ANMZNXsS1ztj~s-1I~fT`SkmI9ZHzq#J4S%?3uv=*%Y zz-~BfHd~0P$84S^mPxa@kCG&KMEj^Z102{%8=ZWP}qLM#-b z6QJmw&>oaAAyO9$A$R*=_taq&s}L!xMCL3&(m7i_a|w^kKidV0+uc^|b_W3(mmYPZ zpC9_h?FJxk{oVjd(Cy9~QRioWqd7S_R)B$dCqWs{k>?`-)e9`3 z^yKXP;aqN<_5YDMhF8tPg-r6Io|u8>fpgh2`vI8Pg>v;H;6!o%X#mbwqtq6{^`fRT z-NwSo@S5Qa0P4+vt}XM-F#z&Mk$jU&m;HIfch|e{9u?+lX+k zGT9Emr)c_ef6%(8V;K>jzaYH7 zmlMQNe`1DMPE;lC<3u07qH=ZTt>EvxaZOX&}Om_fWSE2{DT z3EC~71hydE+e_a9sJRA;JrC)&0JTe?^ad!FDgdVLguHdIKNLUwb_vJ-=AneJQ>{oz zEfn9*>@mXf$B_OpPWt_f))BVFk8}%xGB^Od}DVimX6@lB@tP4|_HyeX;FTF|zn23m;)d%|Af*QQXbLF}rC45Lk)8<7qS zL{BV5al$(Hhl2oQyNF`V9*%g@4Px#07*qoM6N<$f&iD$tN;K2