From 413af0a9b2cc3bebf559f0f5e459cc98c5ee955e Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Thu, 2 Nov 2023 11:14:48 -0700 Subject: [PATCH] [instancer] When partial instancing, subset LigCaretList after VarStore instantiation --- src/OT/Layout/GDEF/GDEF.hh | 4 +++- ....default.retain-all-codepoint.wght=300.ttf | Bin 0 -> 3300 bytes ...ackItalic.default.retain-all-codepoint.ttf | Bin 120020 -> 120020 bytes ...talic.glyph-names.retain-all-codepoint.ttf | Bin 132264 -> 132264 bytes ...ic.notdef-outline.retain-all-codepoint.ttf | Bin 120020 -> 120020 bytes ...Urdu-Bold.default.retain-all-codepoint.ttf | Bin 543364 -> 543364 bytes ...-Bold.retain-gids.retain-all-codepoint.ttf | Bin 543364 -> 543364 bytes test/subset/data/fonts/AnekBangla-subset.ttf | Bin 0 -> 5456 bytes .../data/tests/gdef_partial_instance.tests | 11 +++++++++++ test/subset/meson.build | 1 + 10 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.retain-all-codepoint.wght=300.ttf create mode 100644 test/subset/data/fonts/AnekBangla-subset.ttf create mode 100644 test/subset/data/tests/gdef_partial_instance.tests diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index 387f59508..feecc7892 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -664,7 +664,6 @@ struct GDEFVersion1_2 out->version.minor = version.minor; bool subset_glyphclassdef = out->glyphClassDef.serialize_subset (c, glyphClassDef, this, nullptr, false, true); bool subset_attachlist = out->attachList.serialize_subset (c, attachList, this); - bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this); bool subset_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true); bool subset_markglyphsetsdef = false; @@ -702,6 +701,7 @@ struct GDEFVersion1_2 subset_varstore = out->varStore.serialize_subset (c, varStore, this, c->plan->gdef_varstore_inner_maps.as_array ()); } + if (subset_varstore) { out->version.minor = 3; @@ -713,6 +713,8 @@ struct GDEFVersion1_2 c->serializer->revert (snapshot_version0); } + bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this); + return_trace (subset_glyphclassdef || subset_attachlist || subset_ligcaretlist || subset_markattachclassdef || (out->version.to_int () >= 0x00010002u && subset_markglyphsetsdef) || diff --git a/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.retain-all-codepoint.wght=300.ttf b/test/subset/data/expected/gdef_partial_instance/AnekBangla-subset.default.retain-all-codepoint.wght=300.ttf new file mode 100644 index 0000000000000000000000000000000000000000..b075a80b48f9d295fc170ba6502324b61f1f744f GIT binary patch literal 3300 zcmai0eNa@_6+icVEvyg`)?Efoy5Itf5amPE8nlZ+NEO5af+m^Tm5*Ht3p=nTXzO&h zXg+3aO(abwQ(I@+PLjV8P1{MsBq>g7hM3O8WQfF)W}2D)k!GApI)y-8+}Gc^Z&@*R zruWUe@0@dg_k7)R?|meQ$bn8HUqjul`X}F6c@50RkS;XrYi_+BdZ>;_pCS_XG_>yD z`KMo8bYNV=_(u=4*S5Ut>Z>MF-QfG0TQ^pYoIbcfq)dSSUTa%z+w5!q$jA68@FV_5 z{6nM@jEOLKXJ^PC{%Wmp9{33O#vY6xd-%xX;IqJ&1^mN|11;L{O$+oN?P;2R?E;Z8 z3)$WP@bCZey@xOa9~Doq+uxP{d8`?94e*<$ldxD|JNby0X3H){D`v*Jy z;$^|Q9tQ6S`A5Q(OUJ-J0p2~}4|Q*Qr1yOydk{K*7#1*36M=yTXXSncK$s z`^m=mThK_xX}tlg0j*1oDUQe?W8<$zTfy5AyMm{OdZ|CIAd8fwkx}#K=JV!rI%nfn z)ATi>3{^$CLpu-gv({I6gDMsFdwE+vk9O^8tH%=b#1$)V_D+qxml*W}Edkn18A)6D z;2bGcDy66CHbYYtpn1YJ*=Jw@*?GurzM!<=?MS4HL}E-ln0Q7UO3Vub%h!eyYL}`6 z?~@5h`eYHHZe;vy%YfWN%Am9&getFaA*b|WqgF>;)OHp{P0MRX71$wovvYXgGQ$o0ZF ztNLy7%MuwKv{^drK=EA5E1u7L#qyG=&w$LfT%c#^E?9^lFKw`$D^ctXdzKA*s`jeP zyNIGXm4lL2K`)J7kP?!k2PCb57VuY9#wD+$`1>Vqr1)CN>yjthiCKhrS3oysNF+ky zOkz+xWeQ4|Tj(9Um(3>nt+|&jm|s$snc(=*uQC74u}&;69M-|HvM0QMto5v+eaZDK zlIxi#*E3J9XAzKSSWm{@qM^B~cQ`_K^>q&oAX`>#u-9SQ96;)Sn+N`dsS|zGoTk>t<%I@LHj7>e?`i{ReXT|>9;xj`>6Q6ukE?!)rH{`AM z=eSDuZqAWc+NI$_dy z`q*}FNr|__>s8-dtk7a*B{pwanb%fQ2G7SZH$&fmxpL;%QGLUW53qKKLW6niA6`Wp zDGKg2ORmP3$yJ>CNx9y1YEz zPrs*6=|2=l{|Y_r8u)e%+V&k=w{9v&J6K)q^Cc47x7X4FeHHZyBbINP3;+7;%lY~F zFaCb@>eXu>&&#Nw2DryJv`gPKEUE_<*G=*m9qgHk@ zVIdP1^r@-INje*g3SB>;dpzak)CMLVKVji`C)$BSTITRR6FZ4W((xXOoxB4v55$;6 z7(hIDC&J7IBApSm07PO5!8c$ATd6g(6Sk=D<_odMqR5*fqCTY~_LybqHWYkVLWu-W zEkL1V(c8QiHLj4SL{X9!p9=>KbMfyMxI zv#p^N-hG=7?%RCeXu@<9=%vWr_-if4TS0Ev4ML-PnWlX}4r0Z+@uwV-BS&Q9oaK|JNZ%cOf%vup5S^jVb*l{{{6nR|o(A literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/layout.duplicate_features/AlegreyaSans-BlackItalic.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.duplicate_features/AlegreyaSans-BlackItalic.default.retain-all-codepoint.ttf index c59062184e0113c510f3e2120eea885240bc9904..16cb5f0f04343f1bf84e14c1c2ead27cc1b39dfb 100644 GIT binary patch delta 78 zcmcbzlKsj`b`b_f1_lNJAi=`G;O^q;rgzaGXQN0CBTLE81!0LC)*(l<}$fEu1n{(0GrzpO8@`> delta 62 zcmZ3{$+4o7Lxh2mfq_8)NU$(4xVyNz8L8>oZWQrhWKp%bptCuJ@g)nh8w1be6gKP0 Rfox*U3)!|WWMgFi2LPKG4+sDN diff --git a/test/subset/data/expected/layout.duplicate_features/AlegreyaSans-BlackItalic.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/layout.duplicate_features/AlegreyaSans-BlackItalic.notdef-outline.retain-all-codepoint.ttf index c59062184e0113c510f3e2120eea885240bc9904..16cb5f0f04343f1bf84e14c1c2ead27cc1b39dfb 100644 GIT binary patch delta 78 zcmcbzlKsj`b`b_f1_lNJAi=`G;O^q;rgzaGXQN0CBTLE81!tIF*6Xe05K~NvjH*t_ADC?DLw$(3LBLG delta 92 zcmZpfs@O7BQG|h!fq_8~NU$&nxVyNz9ZFv)vr%LLBTK4ItMTR?j2#v%j2;X;oAs=1 m7$>_}y=u;~Y0t7@1Y#y2W(HywAZ7((HXvr-o@K)!#RmXa-Wf#z diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.retain-all-codepoint.ttf index a49c63e0c7d65173db0e220819327fe8431410fb..1c295de7f3ecdf74036e33ed95d87df01f84624b 100644 GIT binary patch delta 92 zcmZpfs@O7BQG|h!fq_8~NU$&nxVyNz9SmIfV57(aMwax5=GB{bFm_n5Fz_&Zo7`ai mYO{-#4P$ebO?#FNBM>tIF*6Xe05K~NvjH*t_ADC?DLw$(3LBLG delta 92 zcmZpfs@O7BQG|h!fq_8~NU$&nxVyNz9ZFv)vr%LLBTK4ItMTR?j2#v%j2;X;oAs=1 m7$>_}y=u;~Y0t7@1Y#y2W(HywAZ7((HXvr-o@K)!#RmXa-Wf#z diff --git a/test/subset/data/fonts/AnekBangla-subset.ttf b/test/subset/data/fonts/AnekBangla-subset.ttf new file mode 100644 index 0000000000000000000000000000000000000000..e8228d76045f57a82b73627805a9ed6101bafd25 GIT binary patch literal 5456 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/tests/gdef_partial_instance.tests b/test/subset/data/tests/gdef_partial_instance.tests new file mode 100644 index 000000000..caa86f834 --- /dev/null +++ b/test/subset/data/tests/gdef_partial_instance.tests @@ -0,0 +1,11 @@ +FONTS: +AnekBangla-subset.ttf + +PROFILES: +default.txt + +SUBSETS: +* + +INSTANCES: +wght=300 diff --git a/test/subset/meson.build b/test/subset/meson.build index 3920c6beb..e4c8a1f52 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -75,6 +75,7 @@ if get_option('experimental_api') 'update_def_wght', 'empty_region_vardata', 'feature_variations_partial_instance', + 'gdef_partial_instance', ] endif