From 7145607149be79a548d5a2e25ccbeb1fc6dc3492 Mon Sep 17 00:00:00 2001 From: Garret Rieger Date: Mon, 25 Mar 2024 21:41:16 +0000 Subject: [PATCH] [subset] place the gdef var store at the end of the GDEF table. It appears that some font processors assume it is the last sub table. --- src/OT/Layout/GDEF/GDEF.hh | 38 +++++++++++------- ....default.retain-all-codepoint.wght=700.ttf | Bin 131584 -> 131584 bytes .../Foldit.default.retain-all-codepoint.ttf | Bin 44324 -> 44324 bytes ...hints-retain-gids.retain-all-codepoint.ttf | Bin 44288 -> 44288 bytes ...Foldit.drop-hints.retain-all-codepoint.ttf | Bin 44288 -> 44288 bytes ...oldit.retain-gids.retain-all-codepoint.ttf | Bin 44324 -> 44324 bytes ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114196 -> 114196 bytes ....retain-all-codepoint.wght=300,wdth=90.ttf | Bin 114296 -> 114296 bytes ....retain-all-codepoint.wght=150,wdth=80.ttf | Bin 114196 -> 114196 bytes ....retain-all-codepoint.wght=300,wdth=90.ttf | Bin 114296 -> 114296 bytes ...-test-retain-gids.retain-all-codepoint.ttf | Bin 142456 -> 142456 bytes ...gular.layout-test.retain-all-codepoint.ttf | Bin 142456 -> 142456 bytes ...ghtItalic.default.retain-all-codepoint.ttf | Bin 134344 -> 134344 bytes ...talic.glyph-names.retain-all-codepoint.ttf | Bin 145620 -> 145620 bytes ...ic.notdef-outline.retain-all-codepoint.ttf | Bin 134472 -> 134472 bytes ...in-subset.default.retain-all-codepoint.ttf | Bin 40128 -> 40128 bytes .../Roboto-Regular.default.1E00,303.ttf | Bin 2464 -> 2464 bytes .../Roboto-Regular.default.303.ttf | Bin 2068 -> 2068 bytes .../Roboto-Regular.default.309,20,30F.ttf | Bin 2140 -> 2140 bytes .../Roboto-Regular.default.323.ttf | Bin 1960 -> 1960 bytes .../Roboto-Regular.drop-hints.1E00,303.ttf | Bin 1320 -> 1320 bytes .../Roboto-Regular.drop-hints.303.ttf | Bin 1064 -> 1064 bytes .../Roboto-Regular.drop-hints.309,20,30F.ttf | Bin 1100 -> 1100 bytes .../Roboto-Regular.drop-hints.323.ttf | Bin 1008 -> 1008 bytes ...Roboto-Regular.keep-gdef-gpos.1E00,303.ttf | Bin 2464 -> 2464 bytes .../Roboto-Regular.keep-gdef-gpos.303.ttf | Bin 2068 -> 2068 bytes ...boto-Regular.keep-gdef-gpos.309,20,30F.ttf | Bin 2140 -> 2140 bytes .../Roboto-Regular.keep-gdef-gpos.323.ttf | Bin 1960 -> 1960 bytes ...default.627,644,623,62D,644,627,645,2E.ttf | Bin 17552 -> 17552 bytes ...iqUrdu-Regular.default.627,644,62D,628.ttf | Bin 24520 -> 24520 bytes ...toNastaliqUrdu-Regular.default.633,6D2.ttf | Bin 14280 -> 14280 bytes ...staliqUrdu-Regular.default.63A,64A,631.ttf | Bin 26116 -> 26116 bytes ...u-Regular.default.retain-all-codepoint.ttf | Bin 542328 -> 542328 bytes ...in-gids.627,644,623,62D,644,627,645,2E.ttf | Bin 24212 -> 24212 bytes ...du-Regular.retain-gids.627,644,62D,628.ttf | Bin 30420 -> 30420 bytes ...staliqUrdu-Regular.retain-gids.633,6D2.ttf | Bin 20120 -> 20120 bytes ...iqUrdu-Regular.retain-gids.63A,64A,631.ttf | Bin 31976 -> 31976 bytes ...gular.retain-gids.retain-all-codepoint.ttf | Bin 542360 -> 542360 bytes 38 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh index 475e6d74d..03c83a514 100644 --- a/src/OT/Layout/GDEF/GDEF.hh +++ b/src/OT/Layout/GDEF/GDEF.hh @@ -663,19 +663,12 @@ struct GDEFVersion1_2 auto *out = c->serializer->start_embed (*this); if (unlikely (!c->serializer->extend_min (out))) return_trace (false); - out->version.major = version.major; - 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_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true); - - bool subset_markglyphsetsdef = false; + // Serialize var store first (if it's needed) so that it's serialized last. Some font parsers assume + // that varstore runs to the end of the GDEF table. + // TODO(garretrieger): add a virtual link from all non-var store sub tables to the var store. auto snapshot_version0 = c->serializer->snapshot (); - if (version.to_int () >= 0x00010002u) - { - if (unlikely (!c->serializer->embed (markGlyphSetsDef))) return_trace (false); - subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this); - } + if (unlikely (version.to_int () >= 0x00010002u && !c->serializer->embed (markGlyphSetsDef))) + return_trace (false); bool subset_varstore = false; auto snapshot_version2 = c->serializer->snapshot (); @@ -705,18 +698,33 @@ struct GDEFVersion1_2 } + out->version.major = version.major; + out->version.minor = version.minor; + + if (!subset_varstore && version.to_int () >= 0x00010002u) { + c->serializer->revert (snapshot_version2); + } + + bool subset_markglyphsetsdef = false; + if (version.to_int () >= 0x00010002u) + { + subset_markglyphsetsdef = out->markGlyphSetsDef.serialize_subset (c, markGlyphSetsDef, this); + } + if (subset_varstore) { out->version.minor = 3; c->plan->has_gdef_varstore = true; } else if (subset_markglyphsetsdef) { - out->version.minor = 2; - c->serializer->revert (snapshot_version2); + out->version.minor = 2; } else { out->version.minor = 0; c->serializer->revert (snapshot_version0); } + 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_markattachclassdef = out->markAttachClassDef.serialize_subset (c, markAttachClassDef, this, nullptr, false, true); bool subset_ligcaretlist = out->ligCaretList.serialize_subset (c, ligCaretList, this); return_trace (subset_glyphclassdef || subset_attachlist || @@ -1013,7 +1021,7 @@ struct GDEF if (!has_var_store ()) return; const ItemVariationStore &var_store = get_var_store (); float *store_cache = var_store.create_cache (); - + unsigned new_major = 0, new_minor = 0; unsigned last_major = (layout_variation_indices->get_min ()) >> 16; for (unsigned idx : layout_variation_indices->iter ()) diff --git a/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.retain-all-codepoint.wght=700.ttf b/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.retain-all-codepoint.wght=700.ttf index 6715573fd7d039ccfca219a00dbbf79d922f7d6f..69ea3a2d9cf73dd6d4c70890bc34647c7c03bf7e 100644 GIT binary patch delta 69 zcmZo@;b>^#5Mf|sU|#-P`%G5G^gjS^HWZNn delta 69 zcmZo@;b>^#5Mf|sU|;o VR@=?HnHMoO&t%;`la(?34**5P68ZoD diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.default.retain-all-codepoint.ttf index 11a6cf786fdeb87f4c49f90d63bb01c1efb5d339..fe803d765412c9e6b7177ebafffe1cf444889466 100644 GIT binary patch delta 61 zcmZ2-i)qO%rU?ctjE!&OH=1l=0RiL~7=e%(h#43dC#x|lYz|_+ Gv=RXNE)8G+ delta 88 zcmZ2-i)qO%rU?ctEE7LQZ#3D!#3IjQ<1zUKlc9wn0|E#!FakNEV3G$+0{L%%3?StI PgkTmkL}GIw^W~KQGFc8b diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints-retain-gids.retain-all-codepoint.ttf index 2112796ecd53d41aa27b864aba88833648b917b0..28a7e1a21717c8ff4fc3c227084481644e8121ff 100644 GIT binary patch delta 61 zcmZp;#nf<%X@UU@W8>TSjV3dgSW>?nn>+aelcA�|Lk~FajYn5Hm0^PUd4)*lfjo GY$X6MQx1~= delta 61 zcmZp;#nf<%X@UU@%fye-8%<^~vBY25w{-FaCPQ9B1_ThAEXAzA&B(yWzzoC;42+vC InUAjo067Q_o&W#< diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.drop-hints.retain-all-codepoint.ttf index 2112796ecd53d41aa27b864aba88833648b917b0..28a7e1a21717c8ff4fc3c227084481644e8121ff 100644 GIT binary patch delta 61 zcmZp;#nf<%X@UU@W8>TSjV3dgSW>?nn>+aelcA�|Lk~FajYn5Hm0^PUd4)*lfjo GY$X6MQx1~= delta 61 zcmZp;#nf<%X@UU@%fye-8%<^~vBY25w{-FaCPQ9B1_ThAEXAzA&B(yWzzoC;42+vC InUAjo067Q_o&W#< diff --git a/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/colrv1_copy_varstore/Foldit.retain-gids.retain-all-codepoint.ttf index 11a6cf786fdeb87f4c49f90d63bb01c1efb5d339..fe803d765412c9e6b7177ebafffe1cf444889466 100644 GIT binary patch delta 61 zcmZ2-i)qO%rU?ctjE!&OH=1l=0RiL~7=e%(h#43dC#x|lYz|_+ Gv=RXNE)8G+ delta 88 zcmZ2-i)qO%rU?ctEE7LQZ#3D!#3IjQ<1zUKlc9wn0|E#!FakNEV3G$+0{L%%3?StI PgkTmkL}GIw^W~KQGFc8b 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 2d92644a015952b53c466c712a2cada2c82b99bf..d8b2b85b140c70f94d6ab50c7d0f34edd1e1b3bf 100644 GIT binary patch delta 65 zcmbR8hi%FqHX#N^1_lNpAi=_*;O^q;mcDPJ&?H8t+sd1lF*-AI@&RRmfN|SqCDxUU SlRvWkvE7@e6p?SQf%z&Cjoo8jiq REGrnBPqS@5&Bo}t9RU9q5eonS diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.default.retain-all-codepoint.wght=300,wdth=90.ttf index b70db5c0bfcb74b942834f1ad84230ceb27db7a4..9407bc4cf51d5798a48978e2f0489ca46e86ed0a 100644 GIT binary patch delta 65 zcmezIhwaB7HX#N^1_lNpAi=_*;O^q;mcDPJ&?H8t{Ibo<81tDq`GB%Oz_@L*AL~lS S$?~iQ&EMI!e`jNC+ztRk77|qe delta 65 zcmezIhwaB7HX#N^1_lNpAi=_*;O^q;mgcrmXc8k+QQGEZjQPx*c0gGW;G2Am&2Y0k R>k7u^?`+$@voSVq2LLS$5zhbs 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 2d92644a015952b53c466c712a2cada2c82b99bf..d8b2b85b140c70f94d6ab50c7d0f34edd1e1b3bf 100644 GIT binary patch delta 65 zcmbR8hi%FqHX#N^1_lNpAi=_*;O^q;mcDPJ&?H8t+sd1lF*-AI@&RRmfN|SqCDxUU SlRvWkvE7@e6p?SQf%z&Cjoo8jiq REGrnBPqS@5&Bo}t9RU9q5eonS diff --git a/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=300,wdth=90.ttf b/test/subset/data/expected/full_instance/Roboto-Variable.no-prune-unicode-ranges.retain-all-codepoint.wght=300,wdth=90.ttf index b70db5c0bfcb74b942834f1ad84230ceb27db7a4..9407bc4cf51d5798a48978e2f0489ca46e86ed0a 100644 GIT binary patch delta 65 zcmezIhwaB7HX#N^1_lNpAi=_*;O^q;mcDPJ&?H8t{Ibo<81tDq`GB%Oz_@L*AL~lS S$?~iQ&EMI!e`jNC+ztRk77|qe delta 65 zcmezIhwaB7HX#N^1_lNpAi=_*;O^q;mgcrmXc8k+QQGEZjQPx*c0gGW;G2Am&2Y0k R>k7u^?`+$@voSVq2LLS$5zhbs diff --git a/test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test-retain-gids.retain-all-codepoint.ttf index c2ef8fed6e21237f17a753da1cd1d99ef31aa93e..3a9398d238e5783191013c702ef6335ec4296161 100644 GIT binary patch delta 73 zcmexygX6~y4iN@M1_lORh6V;^h5&aLSGScPmfqedV#3IB^CJ; d41AMI*e`Eh&vJ~Z*`1@^or7_^I|q}Y3IH~@6?6aq diff --git a/test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test.retain-all-codepoint.ttf b/test/subset/data/expected/layout.context_format2/NotoSansNewa-Regular.layout-test.retain-all-codepoint.ttf index c2ef8fed6e21237f17a753da1cd1d99ef31aa93e..3a9398d238e5783191013c702ef6335ec4296161 100644 GIT binary patch delta 73 zcmexygX6~y4iN@M1_lORh6V;^h5&aLSGScPmfqedV#3IB^CJ; d41AMI*e`Eh&vJ~Z*`1@^or7_^I|q}Y3IH~@6?6aq diff --git a/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.default.retain-all-codepoint.ttf index 7dcb3ecec817a39ed2fc2c22b7050d2d3fa90a1e..4f0453e63314b62cf8c6c9107b7cc3e00a4cb8bf 100644 GIT binary patch delta 73 zcmX>xljFop4iN@M1_lN}Ai=^Q;O^q;mhvq5^hS{yMwX~s?TwqKFe)-}@&Q!<0i(j^ aSIokUllL?0H2-C3|I5O-{VxmCX?6g*r4)|< delta 73 zcmX>xljFop4iN@M1_lN}Ai=^Q;O^q;mST}Sd80@TBTI}~`^U{w7!{c~t$->(fN$~z Z7TwMJnS~ge|FX3IWntX@mxbvxI{=AR6L$ar diff --git a/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.glyph-names.retain-all-codepoint.ttf b/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.glyph-names.retain-all-codepoint.ttf index f17c60961d41cedf74c4603150126753381c95e4..f49b3618cd53107408bc83318b5619f281e507ad 100644 GIT binary patch delta 73 zcmccek>koo4iN@M1_lN}Ai=^Q;O^q;mhvq5^hS{wMwW;5rgoc47!{c~`G6{bfKg%d aDQ02D$@7_Yn(wl--(_LkewT&myDkoo4iN@M1_lN}Ai=^Q;O^q;mST}Sd80@SBg>=Prt3DBFe)-}S^-sn0N>;d ZEV`TLGYc^`-(_jP%fh(*E(_ClV*tn06iomC diff --git a/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/layout.drop_feature/SpectralSC-ExtraLightItalic.notdef-outline.retain-all-codepoint.ttf index 490ab70c743fa20c1dfe36064062b1754524c020..17bf19b973a8ce2cfda6f1b50c20ee07fe7bbbf1 100644 GIT binary patch delta 73 zcmX>xi{r#B4iN@M1_lN}Ai=^Q;O^q;mhvq5^hS{yMwa5>l=RJ07!{c~`G6{bfKg%d aD`sKF$@`ggn*Xx2|7Bs^{+ETxn*#u!>l0@H delta 73 zcmX>xi{r#B4iN@M1_lN}Ai=^Q;O^q;mST}Sd80@TBTLEpl;b ZEV`TbGYc^`|7B_a%fh(*FAI}52LP6H6HWjC diff --git a/test/subset/data/expected/layout.empty_ligature_offset/AnekBangla-latin-subset.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.empty_ligature_offset/AnekBangla-latin-subset.default.retain-all-codepoint.ttf index e940516bfc98373ef1b38b3d47719135f39c7436..95218938cc420921d07cc281804e88dca2af5c5a 100644 GIT binary patch delta 63 zcmX@Glj*=tCLsn!1_lNJAi=`G;O^q;CY!TSsEm<>_KuJCzj+>mu6gXL$ PSz+>arj*Ur%&jv4!sHKP diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf index dcd48b2e2379dba7e99e42c466f98623948441a3..f0a4b602a0963f2104f0a0607e4a6f786d95bef3 100644 GIT binary patch delta 78 zcmZ1=yg*olfsuiMK?q2&FetdYxVkZzFo-j` V2`I)g`46Kl^CyN6n{Aj<*a29!3KReU delta 78 zcmZ1=yg*olfsuiMK?q2&FetdYxVkYoGw^H_Im)Ok2NVYZKA;Ma8V(@I1XRTWq*;J0 VW(LN|e;93%1pz*wJV*rxkYoZw5Y5QIJeiHD Mm{DwV71JzM03XK(*8l(j diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf index 1d4d5d0d93b4db99834befd827c7b8aabfc83380..17e765012398d7e308166dd794769a2ed0179090 100644 GIT binary patch delta 74 zcmca3a7RFdfsuiMK?q2&FetdYxVkYIGe~U|xydNc2NVYZ37`rlAY=wYMzCrQAjvYB Qhsl+BcgdU0Axs=>0A9KYp#T5? delta 55 zcmca3a7RFdfsuiMK?q2&FetdYxVkZTFz{~_xyi_>1QZ7WzDZ2tlX;n3m?xGpZ4P1L GU;_a8j0qh8 diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf index 34cef3845097b27dcf13f11edec3b7b18ff33985..9d8035e8c9d82956ce52bdee429896a629fcaba2 100644 GIT binary patch delta 72 zcmZ3%zk*+gfsuiMK?q2&FetdYxVkZzZWKDrsK^Ht1pzUjJP0y_Nd^WEAk73~PyWYP M%vig*h{=o<05Bd1(f|Me delta 72 zcmZ3%zk*+gfsuiMK?q2&FetdYxVkaeZWKDrs3->%1pz*wJV*rxkYob0L3~CA=E?sU Niy3n_7crT!0su1x2+{xm diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf index 4800d6d387c4511344dfbb30b6d0dfacf99a6919..0c9b8f4964aef1b6f39aedd029f27916b4dc8b14 100644 GIT binary patch delta 78 zcmZ3%wSr58fsuiMfsdhqftew}-Nn_7!Gu9{qev;EG9OSJ1SEheSQwaq@{C}}z`y~d WnSf#}lh-iXGT)Xq*!+gkh8X~HSqbw1 delta 78 zcmZ3%wSr58fsuiMfsdhqftew}-Nn_7!I^<)qev;EvK&wx1o(g|Kx#OEBohM*5HbQW W6Hq;EIDj-0h&_1| N<7`He&3;Ua7y)cy33mVh delta 72 zcmeys{()VHfsuiMfsdhqftew}-Nn_7!FHoiJ)@!=P!t6Cfbt*}96*u@%m(op8JH(; OVw}y$ve}Pm5hDO^NeOoV diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf index dcd48b2e2379dba7e99e42c466f98623948441a3..f0a4b602a0963f2104f0a0607e4a6f786d95bef3 100644 GIT binary patch delta 78 zcmZ1=yg*olfsuiMK?q2&FetdYxVkZzFo-j` V2`I)g`46Kl^CyN6n{Aj<*a29!3KReU delta 78 zcmZ1=yg*olfsuiMK?q2&FetdYxVkYoGw^H_Im)Ok2NVYZKA;Ma8V(@I1XRTWq*;J0 VW(LN|e;93%1pz*wJV*rxkYoZw5Y5QIJeiHD Mm{DwV71JzM03XK(*8l(j diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf index 1d4d5d0d93b4db99834befd827c7b8aabfc83380..17e765012398d7e308166dd794769a2ed0179090 100644 GIT binary patch delta 74 zcmca3a7RFdfsuiMK?q2&FetdYxVkYIGe~U|xydNc2NVYZ37`rlAY=wYMzCrQAjvYB Qhsl+BcgdU0Axs=>0A9KYp#T5? delta 55 zcmca3a7RFdfsuiMK?q2&FetdYxVkZTFz{~_xyi_>1QZ7WzDZ2tlX;n3m?xGpZ4P1L GU;_a8j0qh8 diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf index 34cef3845097b27dcf13f11edec3b7b18ff33985..9d8035e8c9d82956ce52bdee429896a629fcaba2 100644 GIT binary patch delta 72 zcmZ3%zk*+gfsuiMK?q2&FetdYxVkZzZWKDrsK^Ht1pzUjJP0y_Nd^WEAk73~PyWYP M%vig*h{=o<05Bd1(f|Me delta 72 zcmZ3%zk*+gfsuiMK?q2&FetdYxVkaeZWKDrs3->%1pz*wJV*rxkYob0L3~CA=E?sU Niy3n_7crT!0su1x2+{xm diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.default.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.default.627,644,623,62D,644,627,645,2E.ttf index 55893d0f48c4af297901951e5cdd109b277d4e82..121caa0c46c91add50a40ecda03065c1d05a2069 100644 GIT binary patch delta 75 zcmbQx$vB~tQG|h!fq_8~NU$&nxVyNzF{&`^-YBwwk)`0-g!0Kd7!5fkfC?BG_!z7v WGcoD%GlDg607)hg-mJ%zbi delta 75 zcmbQx$vB~tQG|h!fq_8~NU$&nxVyNzF>)}R-YBwwk)=>>LipqzjE0gLKm`m8atwSx Wr69!|K#~cBCx2qp-K@`)=mY@l?F?=J diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.default.627,644,62D,628.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.default.627,644,62D,628.ttf index 70db5820f52502ebc98c69e98245039fb4fd775a..15d86ccc833288904c92dd2af8bc17d40a92ea5b 100644 GIT binary patch delta 74 zcmX@HpYgEaj8~$}=$VF<4D@ VW76ek1gqx&l1w1Hxriw&764Z*4e$T} delta 74 zcmX@HpYgqFeota0ab$3 YasWwY21y1f2Iqe0Uj4Xf6ly-04!Pvsg#rOuOgn@yN tY1`&4Y%7^IyR+soHpgZjI1pvEB8^izr delta 99 zcmey-qxhpoQG|h!fq_8~NU$&nxVyNzUF5yQxKU&QBMZwjsl}UjFt#vrF-HNFFfi6I s@NIs_p3k`1opl9Mb1Y|jEGHunGXXI(5VHU=D-g2*G5hvdP7Y~X0Q%b*0RR91 diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf index 6acf0c1a53ba6a65bc2a881063d34ef36e9d0f31..d71a950506995bd8a2972f477c92c3f25e927fd3 100644 GIT binary patch delta 76 zcmbQTmvPEoMiB-^1_lN}Ai=^Q;O^q;W*1{Cw^3vPBa5uX=Gx6W7<(BxrGP3J82A`o aO^#!}%g+eb!2u+h7!(ttV31?r a1F8k7<^YmR42lfOll_?QZnkELi~;~wj1IN{ diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.627,644,62D,628.ttf index b3f15ed378e0422b87878f07e74bc938c427594a..f278d3442661efd4806f75d8703e13bf12707e7c 100644 GIT binary patch delta 76 zcmccemhsA4MiB-^1_lN}Ai=^Q;O^q;W-D*gv{7UMBMaZvW3xB!V60{2Q~|1BVBlk9 anC!>=nV%7?g9Au1G4L@IZFXRpQUn0AG7vNX delta 76 zcmccemhsA4MiB-^1_lN}Ai=^Q;O^q;X0yshb)(1vMi&14$3r*oV60`7Gy$q$V31?r Z1F8k7<^YmRKwi;gJLb=u9a$z90RWik5G4Qr diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.633,6D2.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.633,6D2.ttf index 51c6c9517761c7a1ee0deb50746c30794d26b94d..89a186ae4cfd4fc3afc7d4f44a3f8f9a23ae1206 100644 GIT binary patch delta 77 zcmbO+mvP2iMiB-^1_lN}Ai=^Q;O^q;ru|RfXrssiMwTx%H+d)TU_8qy2UNhoz{k)u bc>z-?P$ftM2asfDzQ%l=`Nn1u<`!=NuGkUC delta 77 zcmbO+mvP2iMiB-^1_lN}Ai=^Q;O^q;raeX9XQRjhMwYJuH*QYe!FX2M0H}b0L4kn} bs1&4_14uG6Ut_+`d}DGSQ|V?==4NjIobwU4 diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.63A,64A,631.ttf index 87f712da0d23888b316d19146a0c7398ca493700..cba2f55e9c7d047cb299532d28dadf7d8a1d302e 100644 GIT binary patch delta 65 zcmaFylkvq*MiB-^1_lN}Ai=^Q;O^q;X8*%ZWuwRfMwV|19J4p?V60{2Gytk#VBljE T+8o8q$~f7cS!Q!QOJ@ZDFgFl1 delta 89 zcmaFylkvq*MiB-^1_lN}Ai=^Q;O^q;W-nmpuu)_IBg^*>9Lbw^FxE1v`T$ihFlaIG g0o5`ASt3Bp17`Cx6oYAQhS1G+%&d%?<5@Z@08_3IP5=M^ diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.retain-all-codepoint.ttf index 4458d5fbfa3b8418b130c41fbaa5e2c2b1b6155c..2b453f06810b5d16084c64eee771452b90d8fdce 100644 GIT binary patch delta 99 zcmbQyt2m=qQG|h!fq_8~NU$&nxVyNz-I{t?ZllNoMwZv&j~F-aU~FOLVtfNs!oa}C tv}f}cw)IS#-C6S(o0B=)lQ|iImRBg^N&o7tOpFt#vrF-HNFFfi6I s@NNFWp3k`1opl{kb24XpGAAPtGXXI(5VHU=D-g2*G5hvpP7YIB05i54T>t<8