From cd49b14b4fe5eebddbb9b30d5d9967587d6226aa Mon Sep 17 00:00:00 2001 From: Qunxin Liu <48925186+qxliu76@users.noreply.github.com> Date: Tue, 29 Jul 2025 14:32:26 -0700 Subject: [PATCH] [subset] add more aggressive pruning for MarkLigPos and MarkMarkPos (#5434) Remove lig/mark glyphs without defined anchor points after subsetting --- src/OT/Layout/GPOS/LigatureArray.hh | 19 ++++++++--- src/OT/Layout/GPOS/MarkLigPosFormat1.hh | 16 +++------- src/OT/Layout/GPOS/MarkMarkPosFormat1.hh | 30 +++++++++++------- ...ortaa-Regular-new.default.all.wght=300.ttf | Bin 131708 -> 131708 bytes ...ortaa-Regular-new.default.all.wght=700.ttf | Bin 131584 -> 131584 bytes .../AnekBangla-latin-subset.default.all.ttf | Bin 40128 -> 40116 bytes ...t1.layout-test-retain-gids.41,42,43,44.otf | Bin 2360 -> 2360 bytes ...t1.layout-test-retain-gids.41,42,43,45.otf | Bin 2356 -> 2356 bytes ...font1.layout-test-retain-gids.41,42,43.otf | Bin 2120 -> 2120 bytes ...font1.layout-test-retain-gids.41,42,44.otf | Bin 2276 -> 2276 bytes ...font1.layout-test-retain-gids.41,42,45.otf | Bin 2260 -> 2260 bytes ...s5_font1.layout-test-retain-gids.41,42.otf | Bin 2012 -> 2012 bytes ...pos5_font1.layout-test-retain-gids.all.otf | Bin 4064 -> 4064 bytes .../gpos5_font1.layout-test.41,42,43,44.otf | Bin 1644 -> 1644 bytes .../gpos5_font1.layout-test.41,42,43,45.otf | Bin 1624 -> 1624 bytes .../gpos5_font1.layout-test.41,42,43.otf | Bin 1408 -> 1408 bytes .../gpos5_font1.layout-test.41,42,44.otf | Bin 1552 -> 1552 bytes .../gpos5_font1.layout-test.41,42,45.otf | Bin 1524 -> 1524 bytes .../gpos5_font1.layout-test.41,42.otf | Bin 1304 -> 1304 bytes .../gpos5_font1.layout-test.all.otf | Bin 4064 -> 4064 bytes .../NotoNastaliqUrdu-Bold.default.all.ttf | Bin 543364 -> 543364 bytes .../NotoNastaliqUrdu-Bold.retain-gids.all.ttf | Bin 543364 -> 543364 bytes .../NotoNastaliqUrdu-Regular.default.all.ttf | Bin 542328 -> 542328 bytes ...toNastaliqUrdu-Regular.retain-gids.all.ttf | Bin 542360 -> 542360 bytes ...otoIKEAHebrewLatin-Regular.default.all.ttf | Bin 129896 -> 129896 bytes ...KEAHebrewLatin-Regular.layout-test.all.ttf | Bin 151868 -> 151868 bytes ...KEAHebrewLatin-Regular.retain-gids.all.ttf | Bin 132996 -> 132996 bytes 27 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/OT/Layout/GPOS/LigatureArray.hh b/src/OT/Layout/GPOS/LigatureArray.hh index 59cca40aa..fd1312246 100644 --- a/src/OT/Layout/GPOS/LigatureArray.hh +++ b/src/OT/Layout/GPOS/LigatureArray.hh @@ -19,22 +19,30 @@ struct LigatureArray : List16OfOffset16To bool subset (hb_subset_context_t *c, Iterator coverage, unsigned class_count, - const hb_map_t *klass_mapping) const + const hb_map_t *klass_mapping, + hb_sorted_vector_t &new_coverage /* OUT */) const { TRACE_SUBSET (this); - const hb_set_t &glyphset = *c->plan->glyphset_gsub (); + const hb_map_t &glyph_map = c->plan->glyph_map_gsub; auto *out = c->serializer->start_embed (this); if (unlikely (!c->serializer->extend_min (out))) return_trace (false); bool ret = false; for (const auto _ : + hb_zip (coverage, *this) - | hb_filter (glyphset, hb_first)) + | hb_filter (glyph_map, hb_first)) { + const LigatureAttach& src = (this + _.second); + bool non_empty = + hb_range (src.rows * class_count) + | hb_filter ([=] (unsigned index) { return klass_mapping->has (index % class_count); }) + | hb_map ([&] (const unsigned index) { return !src.offset_is_null (index / class_count, index % class_count, class_count); }) + | hb_any; + + if (!non_empty) continue; + auto *matrix = out->serialize_append (c->serializer); if (unlikely (!matrix)) return_trace (false); - const LigatureAttach& src = (this + _.second); auto indexes = + hb_range (src.rows * class_count) | hb_filter ([=] (unsigned index) { return klass_mapping->has (index % class_count); }) @@ -44,6 +52,9 @@ struct LigatureArray : List16OfOffset16To this, src.rows, indexes); + + hb_codepoint_t new_gid = glyph_map.get (_.first); + new_coverage.push (new_gid); } return_trace (ret); } diff --git a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh index 46013c613..57dae77a9 100644 --- a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh +++ b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh @@ -200,19 +200,13 @@ struct MarkLigPosFormat1_2 &klass_mapping))) return_trace (false); - auto new_ligature_coverage = - + hb_iter (this + ligatureCoverage) - | hb_take ((this + ligatureArray).len) - | hb_map_retains_sorting (glyph_map) - | hb_filter ([] (hb_codepoint_t glyph) { return glyph != HB_MAP_VALUE_INVALID; }) - ; - - if (!out->ligatureCoverage.serialize_serialize (c->serializer, new_ligature_coverage)) + hb_sorted_vector_t new_lig_coverage; + if (!out->ligatureArray.serialize_subset (c, ligatureArray, this, + hb_iter (this+ligatureCoverage), + classCount, &klass_mapping, new_lig_coverage)) return_trace (false); - return_trace (out->ligatureArray.serialize_subset (c, ligatureArray, this, - hb_iter (this+ligatureCoverage), - classCount, &klass_mapping)); + return_trace (out->ligatureCoverage.serialize_serialize (c->serializer, new_lig_coverage.iter ())); } }; diff --git a/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh b/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh index c4d129f2c..3221704ca 100644 --- a/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh +++ b/src/OT/Layout/GPOS/MarkMarkPosFormat1.hh @@ -196,19 +196,23 @@ struct MarkMarkPosFormat1_2 ; new_coverage.reset (); - + mark2_iter - | hb_map (hb_first) - | hb_map (glyph_map) - | hb_sink (new_coverage) - ; - - if (!out->mark2Coverage.serialize_serialize (c->serializer, new_coverage.iter ())) - return_trace (false); - hb_sorted_vector_t mark2_indexes; - for (const unsigned row : + mark2_iter - | hb_map (hb_second)) + auto &mark2_array = (this+mark2Array); + for (const auto _ : + mark2_iter) { + unsigned row = _.second; + + bool non_empty = + hb_range ((unsigned) classCount) + | hb_filter (klass_mapping) + | hb_map ([&] (const unsigned col) { return !mark2_array.offset_is_null (row, col, (unsigned) classCount); }) + | hb_any + ; + + if (!non_empty) continue; + + hb_codepoint_t new_g = glyph_map.get ( _.first); + new_coverage.push (new_g); + + hb_range ((unsigned) classCount) | hb_filter (klass_mapping) | hb_map ([&] (const unsigned col) { return row * (unsigned) classCount + col; }) @@ -216,6 +220,10 @@ struct MarkMarkPosFormat1_2 ; } + if (!new_coverage) return_trace (false); + if (!out->mark2Coverage.serialize_serialize (c->serializer, new_coverage.iter ())) + return_trace (false); + return_trace (out->mark2Array.serialize_subset (c, mark2Array, this, mark2_iter.len (), mark2_indexes.iter ())); diff --git a/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.all.wght=300.ttf b/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.all.wght=300.ttf index 3b17439316b27bbb7c56b4ab524e504eca20b23b..b84254305d06eb47443ef5c8b6af2dc9eefb8000 100644 GIT binary patch delta 84 zcmeyD?0kV%?HIfg-i kfs28WNuPlMNJ=vEGB7eQGj=ofF!naLS#58#V*GX-04?bia{vGU diff --git a/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.all.wght=700.ttf b/test/subset/data/expected/apply_cvar_delta/Comfortaa-Regular-new.default.all.wght=700.ttf index 69ea3a2d9cf73dd6d4c70890bc34647c7c03bf7e..4cf340437f2399503512c22469c1ac3c3d09c851 100644 GIT binary patch delta 84 zcmZo@;b>^#n4rM&qFUwBMwJ^#n4rM&?5|qIMwJe?DV{dbu)%G|m#zn^grg#$c diff --git a/test/subset/data/expected/layout.empty_ligature_offset/AnekBangla-latin-subset.default.all.ttf b/test/subset/data/expected/layout.empty_ligature_offset/AnekBangla-latin-subset.default.all.ttf index 1347ba035737fc067cd6afb39a206271baf0465a..491b760990ef7a0347b54d82d5d165e58bdc9c2c 100644 GIT binary patch delta 144 zcmX@GlWEINrU?o>e>Z-xWMBw-!NA~oW}{9FBTG~KN&d|}j28o$_c2_VoDeL@+r`qw zz{sM)z{9}B5;eIkINDbU$Yx~T!yv)H$iTvIlHn4=Wriz2mJWjgP>hR#nQ0A!3tf2%s1fQx}-+&1$yUBBad&0CTM%l>h($ delta 157 zcmdn8lj*=trU?o>f)DO4W?%?UTa0|!v%AgdXWw~2v| xfq{XEX%zz-10z!eP>hLb9+>S7VguzE7#M*joM1S~aEakE!IH0 diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,44.otf index 08a9e79290abccc494834ed17997378c68ce432f..a9f0ea9237031785d96c3540a61b89b2d71920b5 100644 GIT binary patch delta 49 zcmdlXv_oiuBJ;X8J2$FWFtP+$-Py4@fiaMgpND~o!G=MEfe}bMGB{7(!KAtQC6hlJ E0D|5PkpKVy delta 49 zcmdlXv_oiuBJ;I38#k(0FtP-`x^rT40%IT}y9ommgAD`E SA(de|kW68iwmE|74jTaOW(-dN delta 49 zcmdlYv_)uwB6I3%`;96rj4b(AQ~z$(VPs`wS7Bge&|%=2?7$?+&d9*T;K<;-IfCg9 F8vtGg3<&@L diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43.otf index 2c381013f25c6160af1bbe4d5151cfbb541828e4..b9090357523d07d608a12be82be8fba8b37acb18 100644 GIT binary patch delta 47 zcmX>ha6({$BJ;*q(>JPEGBQ6f{yRB=@gzSF10#bDg9wmhVsK<|o@~G*y*ZfaD=PqV CbqzZJ delta 67 zcmX>ha6({$BJ;^t{To#*8JRbj@J>!(JgKh2z{sG(z{9}Azy^d&Ko%QNB$Z)0kW68i R1|*pn92uN92Qd9$1pp`x4UPZ+ diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,44.otf index fc0ace6e72eadbc48a5aa431a954e8f3c528d065..490dd204aa92e35b046641976868349d95f66a8a 100644 GIT binary patch delta 47 zcmaDN_(X7mBJ;90SsPVY7+H>fxVvz(4r4DPFAoC~g9U>S10xVRPCme-zWFWFcUAz4 C6b{?~ delta 47 zcmaDN_(X7mB6HoFO&e8M7+H=v+!frc!`REnZp6UEV8OsM`52QrDW$1U}Vr>-~o~>3`{_p4aiDmm<}XU7^VS9 MMh3^t9!yhM0sHU_*Z=?k diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.all.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.all.otf index 284652731b9c094f89a5d3a13cb1690a4cc090d9..8e0a629988033158fa81c5f3611b7a8dcd01ce47 100644 GIT binary patch delta 48 zcmaDL|3H3%A#?XzvyCR4jLf^9GH!NYT*%1J!@$H~!yv-I2&5euoF~6v(%dY`e4GaW DY61+^ delta 48 zcmaDL|3H3%A@k<9dK*nR8JV-53T}2_T*%07!ob8}!@x871Cu5@BarRL;JjIa`2-ID Dbteqm diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,44.otf index 9f12f0fa734a3dd315c1e92797c63fba98614b1b..a9c160bb888e50c385b7595e3007dd9eb66507a9 100644 GIT binary patch delta 48 zcmaFE^M+@FBD3Bb%Z)0wjLgUP+}fPN7|6)a!@$H~!yv-I2&5Sqm?!UH(%k%(sh$}C DX_^e@ delta 48 zcmaFE^M+@FB6HXq!;LDojLhYGUTscc3}j?CVPImgVc?m3gh`W~5y)m_VBY+Oseu^) Dbzcnb diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,45.otf index b9e32c9106e6d7268bf67419eb4ba73823a38f89..35e74a430bd473b539b256804ec38b1bc71a3d59 100644 GIT binary patch delta 47 zcmcb?bAxAsBJ-J7$2Y3DGBU@kj+>mrc#@xofssLnK?F!L0WtGr8z#xku}r_20c?c~ AqW}N^ delta 67 zcmcb?bAxAsBJ-11`!}k%GBWF|&YPUWcv4-3fssLnfro*Kfei?mfGjqkNGij0Aeq82 P4M;KpG4tjara#O8P}>db diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43.otf index d11ec14ba6d75542545398cafe1f12e7c40a61c4..62a15d08726e028c16d227735d242cb313aaeb92 100644 GIT binary patch delta 67 zcmZqRZs4Av$ZYs3e4~mjBeOAU*yI$(lj=MSj0`#qB0!P}h?#*T8xS%v@Bm3hhE#^> OKr)44+U5`@9cBQf019sa delta 45 zcmZqRZs4Av$n5#bf1`>mBQrB=+T;|*lk6%Cj0`#qJdrf$w*3}j?CVqjvhVBnd2ibjVcouSt5g`?A*MAkv)Z%hk=Q~gF%Ra5eV;1K9*{}nK|t_ zqXYvF10&-O1{t6%6Z1pnmkbQdubJO7a8CY|uFM!PSuDevk#BNP#`9*+%y!RAMj&Pa UVrC#_0b*7lX4~$W$!`4+001K;jQ{`u delta 124 zcmZpfs@O7Bae@NNw$zHh8&xJSvZO~euim_akv)aoiGhj1gMnxAnN)LDMg~TPdz+ck zUNCYn1~D))?f{B2WhgTyOjgUVW|W(pl<}OOiGhjvA@fTH2Ikky?-@9oJu=%pG8uuG V35c12m<5PgftYQ(M<%jVcouSt5g`?A*MAkv)Z%hk=Q~gF%Ra5eV;1K9*{}nK|t_ zqXYvF10&-O1{t6%6Z1pnmkbQdubJO7a8CY|uFM!PSuDevk#BNP#`9*+%y!RAMj&Pa UVrC#_0b*7lX4~$W$!`4+001K;jQ{`u delta 124 zcmZpfs@O7Bae@NNw$zHh8&xJSvZO~euim_akv)aoiGhj1gMnxAnN)LDMg~TPdz+ck zUNCYn1~D))?f{B2WhgTyOjgUVW|W(pl<}OOiGhjvA@fTH2Ikky?-@9oJu=%pG8uuG V35c12m<5PgftYQ(M<%ijDvxZ#fE{0fr&|pL1XfoVA;u=1N9hJO@0*U%NVxVAgGqH`DAeW$zVnx WW&&bnAZ7t#Rv>2EelnPS{U-qZLn>+j delta 148 zcmey-qxhpoae^Xq*)ENZDiau4{+cQ6-n@gc+Mhjzfl>St1J7i)z({#U1{Q`J3^y6> zFx+KeWnf@nWZ+<6WU*mlV_;%Z0;)L|sLyz8^1nb|#-hzWLA8w1Oi&FBU@c6{x0xR^ murNPme#yYwd?L90L@*-|GXXI(5VHU=D-g47KM~Bn;S&G^XfI0u diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.all.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Regular.retain-gids.all.ttf index 2b453f06810b5d16084c64eee771452b90d8fdce..967249a57c6f8d6acf6c07b4c813bc4c5a67fa23 100644 GIT binary patch delta 148 zcmbQyt2m=qae^ZAll-|GRVFa9yt@1B|K=Txll_Hx7#PJbF-R~lGO#e*V7SR}hvDwz zpuk9dRt5&37zYC*iwy%00~3=Hg9ZZ=R1E`26$2CVZRW=eEX+@tUo!AcJ{73XxN7pR oKwrkN%^pFujLi>&+aCrq0x=U1GXpUT5VHa?+xCaS?At#90A#>1MF0Q* delta 124 zcmbQyt2m=qae^ZA@gkXxDiau4UW-3s+`NNvvOjwY1EcsQ2A;`rfsyiz3@i*c7;ZA$ zVYth{%D}+D$iTtC$YR69#=yj+1XS}ZP@nPGWU(M$#-hzBLA8vNPY230KMZbv7|aO7 WOhC*G#4JF}3dC&N9|p5;{{#RqkSRO> diff --git a/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.default.all.ttf b/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.default.all.ttf index 067526c6fd2db0070b00eb3413ec91c2539af339..7675ff929ac24c564d8f509701185464c921e177 100644 GIT binary patch delta 117 zcmaFyjs3+p_6Z6sj?YvwH>#*IGN1RHv)P9+x<#9Zft8_*L4<*kfr){efd@#MFt7nh z4F)AvD+U<`F*X&Bd2DiQ5^O?~PqnHle&Z-${lNN)^$AeNPevUEM#fwQ1`x?40TN+g OXqIT(F44vqPznH(ni_uq delta 96 zcmaFyjs3+p_6Z6sPAn>aH>#*IGEep>+3dp@-J+bwz{*g@z{9}AV8Xx#BsCb6Se+PT z7{u6gIF_-gu_>@gO}^Bs%K49@g7pXMC)PKU+9cT-feN`9c$y{Jwo9}z29yE-=kOSY diff --git a/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.layout-test.all.ttf b/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.layout-test.all.ttf index 17d2eb8b83f751511a1c7bed78df3c2123f8b215..4320381620862f16a861dbfcae03467c8f7ae063 100644 GIT binary patch delta 117 zcmdn9h;z>(&IyXlA#>w5s;DrsSSRdG*zCioyGfgeft8_*L4<*kfr){efd@#MFt7nh z4F)AvD+U<`F*X&Bd2DiQ5^O?~=WJG0{Kiqh`hoQo>l2`kpNu*TjEuPq3?Pz80wlt~ P(EMui_E(!3gXRJN2h$r# delta 117 zcmdn9h;z>(&IyXlFXq;6R8e7Mv9j2$ve}1Gcaw4+11m!r0}lfeg9!s0kknvMVs&DW zVGv`};aJ9|#-_j~HF?QqRn31K6|6s4Ke4`HU}X5osKda>n9INbBAFyWA|N(UH#Y-M O^Q+CX diff --git a/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.retain-gids.all.ttf b/test/subset/data/expected/layout.unsorted_featurelist/NotoIKEAHebrewLatin-Regular.retain-gids.all.ttf index 55440c402772c1e6b688e1719d43ce7404e6bec5..21bc5c7a74ae28fb942593e38bcc675ab934b712 100644 GIT binary patch delta 117 zcmZqa=VL$um>9Sjcz~n{0~?Uk zU{GSUVvu1FV^iUn$0o-n!6r2M*+f;vZyW`zA6Q?pJ^||Z$*9A?$e7E(03w+rKq3qb O%_ft!n@nO1C)%Oc>aJqy~c$s}q9^ zgBY6*$1*lGHU&1R$?qnra{l9}VEw`RiS^B7nMsoDj6jv#3_Q&yleU{oVhkt+0H|sh AKmY&$