From 975bd39b158e454a84b7b947d156561a21aaf24f Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Wed, 27 Mar 2024 19:28:53 +0000
Subject: [PATCH] [subset] Match hb rounding to fonttools for avg char width.

Update Muli and Roboto input test fonts to recalc class values. FontTools recalcs class values during instancing while harfbuzz does not (like the ft subsetter).
---
 src/hb-ot-os2-table.hh                        |   2 +-
 ....default.retain-all-codepoint.wght=300.ttf | Bin 131708 -> 131708 bytes
 ....default.retain-all-codepoint.wght=300.ttf | Bin 5788 -> 5788 bytes
 ....default.retain-all-codepoint.wght=700.ttf | Bin 5784 -> 5784 bytes
 ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114196 -> 114196 bytes
 ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114196 -> 114196 bytes
 ....retain-all-codepoint.wght=200,wdth=90.ttf | Bin 6736 -> 6736 bytes
 ....retain-all-codepoint.wght=650,wdth=85.ttf | Bin 6688 -> 6688 bytes
 ...-all-codepoint.wght=150,wdth=80,CTGR=0.ttf | Bin 1396 -> 1396 bytes
 ...-all-codepoint.wght=300,wdth=90,CTGR=0.ttf | Bin 1432 -> 1432 bytes
 ...tain-all-codepoint.wght=400,wdth=100.0.ttf | Bin 6780 -> 6780 bytes
 ...etain-all-codepoint.wght=drop,wdth=100.ttf | Bin 6780 -> 6780 bytes
 test/subset/data/fonts/Muli-ABC.ttf           | Bin 6996 -> 6988 bytes
 .../subset/data/fonts/Roboto-Variable.ABC.ttf | Bin 13480 -> 13448 bytes
 14 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh
index 272661378..43b58d9bb 100644
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
@@ -223,7 +223,7 @@ struct OS2
       }
     }
 
-    return num ? (unsigned) roundf (total_width / num) : 0;
+    return num ? (unsigned) roundf ((double) total_width / (double) num) : 0;
   }
 
   bool subset (hb_subset_context_t *c) const
diff --git a/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.retain-all-codepoint.wght=300.ttf b/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.retain-all-codepoint.wght=300.ttf
index 35ad91f9517cb5542398c9795cfa35655d88cda4..18b352e45e1320aa5019bca0a85ef9e4cec4d407 100644
GIT binary patch
delta 31
ncmey<!ttktV}diI!bX>FM#k@xFEHveRyHxUF)>bKVyXcE#B~a;

delta 31
ncmey<!ttktV}diI{6?2<M#i6$FEHveRx~lSF)>bKVyXcE#B~a;

diff --git a/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=300.ttf b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=300.ttf
index f79fdd859454d511b0aaf4803c76eec3e71f1f59..add22aff700e24be1ec42f246d2b6bfa9621e3bc 100644
GIT binary patch
delta 155
zcmbQEJ4bhdqVhGB8U_Yt76t}}2KV4lryYNGykcNrJOkuw_y_A7CG4$9pXidqBB3T{
zvvEreqfBsX`|@~xo39M)%rAh77_M;4T@9iiX({_m_F;-<Y@fV>X^jB`!~f?%{2e6q
m|Ly;;42%rSK+FUtA#4U94<rI6Cr@OSn!JFSd-F=>&q4s`-6@R#

delta 155
zcmbQEJ4bhdqVisqDGUtEEDQ_`4er6APCNeWc*VfLcm~MV@DJ8EO4wVIHqj-Ag)b?R
zZR3_2MwxVb!Kd;3HeVUonO^`EF<jx8yBb8_NQ)Dj?86kz*fx0u(;9>S&q0F!zy5y<
oroS^VGB5)%6PN_CnSkPqU=b!Dn{o0)W~s>wn7KEvWd1A!0P%$>jsO4v

diff --git a/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=700.ttf b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=700.ttf
index 569032eb75f7fd6544c418df3dfcddcb32bb223d..3c8b74499cc4d5ebbadda473cf8e2b50b1377068 100644
GIT binary patch
delta 155
zcmbQCJ41JZqVgS;CI$v(76t}}2KV4lryYNGykcNrJOkuw_y_A7CHdAAOmxX%k+6}o
z*|?>KQRc#v`lIpuHeVUonO^`EF<jx8yBb74(o*)B?86kzIAQV%rZol(4F7@V{QnD*
n`v3X=Ck93aW*}w)lMprokOvY0lanVhOHE$D%)NOf^LrrxDK08S

delta 155
zcmbQCJ41JZqVh47=?o0aEDQ_`4er6APCNeWc*VfLcm~MV@DJ8EO7gAApXidq!dDT=
zwsA`hqs)^TT%7UzHeVUonO^`EF<jx8yBb8_NQ)Dj?86kz*gts%(;9>SKvNhP{(t)a
p8BG6WU}RthVkR&NVlx578Nnh<KsMv#iOf=y7cg^gUdjAk2msLeDMtVR

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=150,wdth=80.ttf
index 757611f922e41fe68cbf71a23bfe06adb678f4de..2d92644a015952b53c466c712a2cada2c82b99bf 100644
GIT binary patch
delta 31
ncmbR8hi%Fqwh7LR92;Gd85w_0Ucs2p$k8mpv|WOU@y~7mzw-+=

delta 31
ncmbR8hi%Fqwh7LR>>FK@85w_1Ucs2p$lff$v|WOU@y~7mzw-+=

diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=150,wdth=80.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=150,wdth=80.ttf
index 757611f922e41fe68cbf71a23bfe06adb678f4de..2d92644a015952b53c466c712a2cada2c82b99bf 100644
GIT binary patch
delta 31
ncmbR8hi%Fqwh7LR92;Gd85w_0Ucs2p$k8mpv|WOU@y~7mzw-+=

delta 31
ncmbR8hi%Fqwh7LR>>FK@85w_1Ucs2p$lff$v|WOU@y~7mzw-+=

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=200,wdth=90.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=200,wdth=90.ttf
index 7a6eed8eb731cb87ad012d588270f4888de41324..e1c5e0e98057240410be99c96239a660587f1db2 100644
GIT binary patch
delta 119
zcmca$a=~PRqVl)5+ZY&_RTvl;dfbCUohI`(F)=VOUI6k<{Dbw4iW?iZO?1g&;d)zt
zY2%h2Mj4gBD_i6FZN4%{a{$#aFdX?Hs0X4SX(@f29K)2&m_PXh(+-Fn!~d_7JD3&O
P85x)ufOzu;<^^H^&8;J2

delta 119
zcmca$a=~PRqVk)!2N)QbRTvl;dfbCUohI`(F)=VOUI6k<{Dbw4iW?iZPISp(VOgfb
zxN%Dlqm03q8rOJ!o39Mg96&V;3`af)>VfFnkIpMhj$z7X%$t0IX$QyuuOLANhRGew
QitJ1bAjr6R1M>ng0EC|+WdHyG

diff --git a/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=650,wdth=85.ttf b/test/subset/data/expected/instantiate_glyf/Roboto-Variable.ABC.default.retain-all-codepoint.wght=650,wdth=85.ttf
index abda0115a6bc1fbf46986b2c14b63e81d780627c..dbc663c74c8c250f04214e6a3c1134bc5b767b63 100644
GIT binary patch
delta 82
zcmZ2rvcP15BJ;Pm>n5u7uyFg<U)i{&hf#*ra{Iw}ew(ih(i{vRaO8ua9*BOVrSx%g
d43hvOM3~|K+sP%&itLOGObkH0c@A@n7yx{g7q9>T

delta 82
zcmZ2rvcP15BJ-2C2PUfYu&}b}FmK$_!zd&8Cf+`t-{vcWGzS9+9Qh!q2cmC3I<K%f
ehDm^t<NsR_pMha=39}+Q69Wh`Zl1&3A_f3BRTi=U

diff --git a/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=150,wdth=80,CTGR=0.ttf b/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=150,wdth=80,CTGR=0.ttf
index 123d482d1c725e946485a986446ea87effbc59ee..b86ed16c7a3e912883cd55f78e330ab49226166b 100644
GIT binary patch
delta 42
ycmeyu^@U4>fsuiMft#U$ftkU;KUm)=^JJ{mMv-(zM#0H7jM<F$H@{%)VFm!zYYSlj

delta 42
ycmeyu^@U4>fsuiMft#U$ftkU;KUm)=^JJ{$Mv-(zM&ZddjM<F$Hosu(VFm!zYYSlj

diff --git a/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=300,wdth=90,CTGR=0.ttf b/test/subset/data/expected/mvar_full_instance/NotoSans-VF.abc.no-layout.retain-all-codepoint.wght=300,wdth=90,CTGR=0.ttf
index c7886907f720f93b60ab0bacc4f10317a77fbe9f..bcc6fec409b515aaa85107a7118038e7c742517b 100644
GIT binary patch
delta 42
ycmbQiJ%d|>fsuiMft#U$ftkU;KUm)=D={`>qewa<W9;M_#&SlE&0iRoFarRxx(XKn

delta 42
ycmbQiJ%d|>fsuiMft#U$ftkU;KUm)=D={{Gqewa<WBlYA#&SmX&0iRoFarRxx(XKn

diff --git a/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=400,wdth=100.0.ttf b/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=400,wdth=100.0.ttf
index 27db21c95d1ae0448ede55022cd2bb843cb06124..42535d949da57797169036912c0b2379efe566fd 100644
GIT binary patch
delta 82
zcmexk^2cO?BJ;Pm+a{{?uyD84U*5Q-hf&6V&s_U>ew(ih(i{vRaO8ua9*BOVrSx%g
d43iHdM3~|K*U1~071<dXm>7U~^9|-DVgTS#8MOca

delta 82
zcmexk^2cO?BJ-QK2PUfYu&~<eFm2q@!zdFI?{YSt-{vcWGzS9+9Qh!q2cmC3I<K%f
ehRKJK<NsF>pMhcW24+QeCI%2>+<b$1i5LKyGZ?o3

diff --git a/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=drop,wdth=100.ttf b/test/subset/data/expected/pin_all_at_default/Roboto-Variable.ABC.default.retain-all-codepoint.wght=drop,wdth=100.ttf
index 27db21c95d1ae0448ede55022cd2bb843cb06124..42535d949da57797169036912c0b2379efe566fd 100644
GIT binary patch
delta 82
zcmexk^2cO?BJ;Pm+a{{?uyD84U*5Q-hf&6V&s_U>ew(ih(i{vRaO8ua9*BOVrSx%g
d43iHdM3~|K*U1~071<dXm>7U~^9|-DVgTS#8MOca

delta 82
zcmexk^2cO?BJ-QK2PUfYu&~<eFm2q@!zdFI?{YSt-{vcWGzS9+9Qh!q2cmC3I<K%f
ehRKJK<NsF>pMhcW24+QeCI%2>+<b$1i5LKyGZ?o3

diff --git a/test/subset/data/fonts/Muli-ABC.ttf b/test/subset/data/fonts/Muli-ABC.ttf
index 60e652039ad52a40a952a2ffb8d3bc9af7b713fc..0e9522dab47aed83655f736228f2e7ca0f4220b0 100644
GIT binary patch
delta 1330
zcmaJ=TWC~A82)C?*{j=4x{Y-gBu!P+2JIzXLZMNTG|8qCQQWNwAzBaXUefL+Yuw6~
ziW^GtL0V`#VAEo?sFYr;P_?jq%Y(ky2!RHaQu^RS>qA9~5#xoNeslJa(3j5P%zWQB
z|84#=XRdvwy$S(f6(<v=L{D$u;(K;4@N|XhP-5qf<PS&J{YXAbem0SOqr3L7Hcy8#
zd29dfu3Zc9d!LhkMZRrE@`X0**~4!EVu5^LGS!v3`{J+9aQ|=eDeI6m5r3471JMu2
z*QbkCwS*9k12Rt`o~FT#;a67C;2inS=|km~;B&DDz>|~Y?`KQ7;>q?V79&pp;gwn1
zt4pJw0x|7BlCut$xHht2z4~*7ce6ij$}|8GYT{Uq_V({DP0{```O$o)YVD71ZtfsC
zOo#S-K4W>WiAUs@$k*kI<w|e^eq+KR9k?)_ws0Sl3}})Ei&mv12E!lI{swu=m{rVd
z+kPMmJjDX#h0^%JvV96|ENG|RFHK}h8+yh*VJIE{7gTloW$cS=^O@S44ITI3Gj37A
zod3)3^?I{)?EoV7f}D}Fq+Up^a?sDXZF}kb2O@~b8Lj+hn2us%4Gc$@XvH8tBAyDb
zbQDt_Q?tfMqnJmV4kN$CkUWR2Dkb9=JD!M!)i>U2>SeP<b(&t4H1`IyTN{sm<>EvC
zNl_&;Aj|+W`ElCC5@CGjVgt{k=3*03{OMv3c4N`SUPMKzj(LQTD7aXlNmN`c5fmS~
z*jS4HT0od+6vy2S5B%b57kd#A=Uwch^R$co#8+J$V6r(i6*}YFj(1SNsOk%CQCmV$
z_1B8M>iUYt>L4;0MGkqC(TfV_30N3d(w0$@mPP8_7-yvYOY5@N@=k#<(s&!YXj>#6
z!|RM}=?bXpmO8^ep{|P99%0*PV1o^Q=K5I8WfL!ga8y0(OA&HjeF^j%a^}@~ZyM7S
zfKEP6Y;7$b2Npf@vFi6Es$0=d-OUQvw~*5I_5%#-RS)|PhV6OmV?2Iv=Bv-ThUGeV
z7ilUcwS)de$T{n3f>@7@kUf0^DTE7Fd5l*<|3Bc_>d7?W(8fR$-);x#>Hm(SgE&d=
zuD!4Cv~GsUiVSt$Jf#A1qx#2FQwNNZ%{ofGQO)(#{4exqVf!z1vPF}UO^eYc2B_1%
TS3Lp=qMN?Yh`NZ5_>cSxvW(}E

delta 1333
zcmZ8fZD?C%6n@_K-h5iqtoF9a(3x53s;rxYE{N8$)^3?Hx6;IYQ8zDXngo+H>*B01
zmMTMJD5zIlaq|Nl;@E!7eZclZ$REM6GB%wsM27flh+|+UbsBno-kWQGcrN$6&vVXs
z&pGdT-?_x~L=6H!CzXy$a(Kf=`}@T>AnUa5NRDhx_4XdW26#4+A5W%U9J<iB@EiTB
z$$K_!8ysEOHUA-?MO6IO)Y`bY@_<1;NB(juJ(!+<;)jQs{51Kjx!;`X`zO`M{W^Jf
zrexMCXu(G`q-p5OFyO|nCp%g2ck+vw{nc3TvFJS}PzB$dsN_nYCfct8_xA%KV}kM4
zxxxo5SfPI`XYNyL7!U`z`g6tCC(f_Vwh}gIJDg*D?dPv&0biB;t$em-j<;UgSz-fk
zb3-DZ&zk-<@+h6ZkUyF)Ri}fi@Dura<l*9E#>4_<$PbYROXhS%WLqB~|C~HlHcQ!o
zzxM8>i}~c4%H+PP{TVn>QCI%TRJO8excolg{fhiDo)r+b4R%P0Gx4_!y^FZKi8grx
zJLD-0I9H@24KKF92Z_hA9q%%JHe~SHG;5@zYbCVXwwH5TYp+{0JppHrlhjqZbtux?
z6+|~bIlOUm8f`_hT1Lq6>q@f^ij|jr%~v6#A0N*4kMC*i{}Vp#mU3SAe{xc-Hzsy>
zu+SY(KwnSlWm8QN(AZ>C2Dr32jXdb+7Wz08{-P0B^vDLSvW_|pz<Pd)6SknHlzNzw
zTBTH4NsNEH0*-`vdKL4ZzsK3Wg0`@OoKo{$3x>l~4)y)NWHVYYuMhs$a``I0vkpd+
znl9H_4KZfDv8>zra@ij1cIPqc$Bv<w#xTN)>L{>p;d!+xvF~EozQfyc#lGj<oa#+=
zNSRSeI$BVxUbLmoBoR+*or-*8oe$6Ts`EC-vBEhe@CYs71j;y5=dflZXB4F+%3Xg%
zpY{MrqWJP7M1w?EmLEJDZaXGwVt{pouHJ-SBwQ>J5<M=~um*p-SVsiEy4Ztlc*n(F
z+N({>)>@Evv6@@j#S%fz!>J{-rTn#k(0L(GxegEfeCW*}FW*PZ#XfHCaIv3Qy%sht
z0z|-bEN-HR0x}rIBuZpu4AElJ@(MO!nh{fEL-ZCgzO<&o$TGaJWY}!oG#<KdJFNxe
oc#f*oZ$zz<v0KEfi1CauN>2{2I;p4df`bZHx&4c?M`bkhFCWt2M*si-

diff --git a/test/subset/data/fonts/Roboto-Variable.ABC.ttf b/test/subset/data/fonts/Roboto-Variable.ABC.ttf
index 6cf001fc854c4f501f2a4bf4dfcb66a28f8aeafe..a70db42b2a5a8e4ed1ef0c5aae5de60341a18886 100644
GIT binary patch
delta 913
zcmb7CO-NKx6#nk}n`b_pv@vobo1Ae5q*O+;AQu{H22#;XQ6T7Z8fVNI8)ha^NXJB?
zRaj3F!i9?#F5JYBByA)LqM%KSgdiwLiWX&Nl$Eb@-@{#-&VzT)`OdlD`Odv}uJ3x^
zq$hWA_3b^NVisW9vCx^L{?C17fOj6iMElw1(^It%-vGW^iXWW})daK0#~Iarptw5}
zZVulvPmEIj8)5tPK|S3z+9U&h59J#pNj(J(w*eteaeZVk>pAknKLWU@9-F<XSXpvT
zo(NLG4B))hO9Xqn)b~WtdGkSe&rTH(S7L;+x$|{EU=q;2$D{g%!jardYMCIKhByJ*
ztVojCU5b72WOk_Xndl+bc8WcTOA%eVDs}^<ylqKRA4-Wc&Sk29Y8+<Oxe_0hz5vYy
zkttOb%dswJ<2rUzce2M{imUnhuBu`cF7uOIE<d5L00KwJXrCjosR8mhTqu>xEhal>
z|5Xc75rk*~0=A<Dcc|-%^D-P9lcYsMRXU9&d0#%N+}KeJ9KtkSvpwtzn`di4KEXbU
z`PH%oH5Wt&q?WdhFx-*hbOP>JI@%9+LeCDs4T<xarlpTTh@>(p6!k~b1EkJUYyBw$
z1-4cOu28XXkvxHP3Kpi)+Km><3}B3y>23j|)$5YXbxau^?=It%*OfEBa-57&g}q;)
zxfp$l728?P%?Rfw$E>rEXeAr7b#0>)`k%>ynFxw9nc7^#KSuLe)O<979-&A=WEz0C
zwFUCVTZ41l&TuvSm=?HW8L!hQ3!Eb+WeH2<ZdntW$Td>FgG@D^`wj$pUR7%wFw;K^
t9luR8yir*2%QUCyZTz9zhU$Q%$RZQ+C6#r|7!EY%TmAJce?PFM{RJawq@Vx*

delta 960
zcmah{Ur1A76#w0S^G;XJsbem*(dHyrQ>U4bfreO#B;^VM!(Hc}nVXJn$qI7`78XH&
zZf5i#Ju3JRtOw~Ke25-;D0+|}Un)oldJx5^rLObcE7@BgeCPXq=bZ0%&hOkiIWRkL
z&yk8xe)Iqbo&ucdM8~<~S07sU0?v5=6DQ9%ojn$MIR&_?2!C$xsPrXHjlTyBBH=)X
zzsdg~dwL8gFQWGzWkiX!j5SI?MS|iD!H5!t36Chhhj49hB;h#v(|rxFtrFhui}sg9
zW~B)qB|HZ5Z}t(v{x10|;BLIXP}a?b0b!+|yxi=C8lrs$n0|zMl^&tp^8}D4iKZ?@
zj@%d09N|xdU7<)KS^h?F5MCtg2oDDpaa;%xW^Gv_N-`=em|qk2tM#1MV08fe+q7)`
zCZssZkTHj1j35U*%%}ua;#cx7Lja2cM=*_Lu9O?)=DBsk%qwt)8qYyrSAN3=_Q@;@
zuT~4Z>|Flx&XKWiEg7rjI6)(^YD>6-9;qIs;wI*#!$^vwP}EL-PX+PigttwU+M2O%
zw;HQ=>gvy!l_83^)bCtpI>g^COs|(bms2kIAU3zO`QZ&-iG|_qkM$118&(oS@PZFU
z<5AcKdt*Z=qYkWO9U7soiK80q#=%ZenNAy!&1$`}NFT*`TtYLQN!*4A`plHEff@Z&
zo1GRuyQZFTmZ$+|F54+a$A-phR@%84Xt2y@Ag?|OhFB3caQzLafY#V`eZ0B&pFCeY
z2wOZ}RktgT>T7hm-PNb-Ec-_v4+}M8AWf{SS+l#1>mnEn{pMI=7i}?~B6<e|Xb;oA
z!DKCBk*>7Vi>^jDOJX_&h||)RCR6$=Q_OaM@R~9(s57oZ_SmnyoXu?3pUE@+W|Nm;
cmWzuD3oJ;lxoWty;;!Y?a(6>|s$$*r2mC^>hyVZp