From 190b7a98f8af54cc42d3ccdb6979e432dfd41aa9 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Thu, 8 Oct 2020 14:44:54 -0700
Subject: [PATCH 1/5] [subset] Update PairPosFormat2 subsetting to match
 fontTools updated subsetting
 (https://github.com/fonttools/fonttools/pull/2221)

- subset class def 1 against the coverage table.
- Don't re-use class 0 in class def 2.
- Ignore class 0 glyphs for the purposes of determing format 1 vs format 2 encoding for ClassDef.

Add an additional test case which demonstrates these issues.
---
 src/hb-ot-layout-common.hh                    |  43 +++++++++++-------
 src/hb-ot-layout-gpos-table.hh                |  14 ++++--
 ...VFPrototype.keep-gdef-gpos.41,42,43,57.otf | Bin 5444 -> 5400 bytes
 ...obeVFPrototype.keep-gdef-gpos.41,42,43.otf | Bin 4916 -> 4872 bytes
 .../AdobeVFPrototype.keep-gdef-gpos.41,42.otf | Bin 4436 -> 4392 bytes
 ...obeVFPrototype.keep-gdef-gpos.41,56,57.otf | Bin 4556 -> 4540 bytes
 .../AdobeVFPrototype.keep-gdef-gpos.41.otf    | Bin 3692 -> 3688 bytes
 .../AdobeVFPrototype.keep-gdef-gpos.42,57.otf | Bin 4556 -> 4524 bytes
 ..._1_font7.keep-layout-retain-gids.2E,23.otf | Bin 0 -> 1944 bytes
 .../gpos2_1_font7.keep-layout.2E,23.otf       | Bin 0 -> 1508 bytes
 ...font5.keep-layout-retain-gids.21,23,25.otf | Bin 1776 -> 1824 bytes
 ..._2_font5.keep-layout-retain-gids.21,23.otf | Bin 1644 -> 1692 bytes
 ..._2_font5.keep-layout-retain-gids.2E,23.otf | Bin 0 -> 2024 bytes
 ...font5.keep-layout-retain-gids.41,42,43.otf | Bin 1988 -> 1988 bytes
 ...ayout-retain-gids.retain-all-codepoint.otf | Bin 3684 -> 3732 bytes
 .../gpos2_2_font5.keep-layout.21,23,25.otf    | Bin 1440 -> 1488 bytes
 .../gpos2_2_font5.keep-layout.21,23.otf       | Bin 1320 -> 1368 bytes
 .../gpos2_2_font5.keep-layout.2E,23.otf       | Bin 0 -> 1588 bytes
 .../gpos2_2_font5.keep-layout.41,42,43.otf    | Bin 1288 -> 1288 bytes
 ...font5.keep-layout.retain-all-codepoint.otf | Bin 3684 -> 3732 bytes
 test/subset/data/fonts/gpos2_2_font5.otf      | Bin 4580 -> 4632 bytes
 test/subset/data/tests/layout.gpos2.tests     |   1 +
 22 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.2E,23.otf
 create mode 100644 test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.2E,23.otf
 create mode 100644 test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf
 create mode 100644 test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf

diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 0ba7e3c06..a0ea8c164 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -92,6 +92,7 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
 					  const hb_map_t &gid_klass_map,
 					  hb_sorted_vector_t<HBGlyphID> &glyphs,
 					  const hb_set_t &klasses,
+                                          bool use_class_zero,
 					  hb_map_t *klass_map /*INOUT*/);
 
 struct hb_subset_layout_context_t :
@@ -1649,6 +1650,7 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
 					  const hb_map_t &gid_klass_map,
 					  hb_sorted_vector_t<HBGlyphID> &glyphs,
 					  const hb_set_t &klasses,
+                                          bool use_class_zero,
 					  hb_map_t *klass_map /*INOUT*/)
 {
   if (!klass_map)
@@ -1660,7 +1662,7 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
 
   /* any glyph not assigned a class value falls into Class zero (0),
    * if any glyph assigned to class 0, remapping must start with 0->0*/
-  if (glyphset.get_population () > gid_klass_map.get_population ())
+  if (!use_class_zero || glyphset.get_population () > gid_klass_map.get_population ())
     klass_map->set (0, 0);
 
   unsigned idx = klass_map->has (0) ? 1 : 0;
@@ -1730,10 +1732,12 @@ struct ClassDefFormat1
   }
 
   bool subset (hb_subset_context_t *c,
-	       hb_map_t *klass_map = nullptr /*OUT*/) const
+	       hb_map_t *klass_map = nullptr /*OUT*/,
+               bool use_class_zero = true,
+               const hb_set_t* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
+    const hb_set_t *glyphset = glyph_filter ? glyph_filter : c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
@@ -1753,8 +1757,8 @@ struct ClassDefFormat1
       orig_klasses.add (klass);
     }
 
-    ClassDef_remap_and_serialize (c->serializer, glyphset, gid_org_klass_map,
-				  glyphs, orig_klasses, klass_map);
+    ClassDef_remap_and_serialize (c->serializer, *glyphset, gid_org_klass_map,
+				  glyphs, orig_klasses, use_class_zero, klass_map);
     return_trace ((bool) glyphs);
   }
 
@@ -1903,10 +1907,12 @@ struct ClassDefFormat2
   }
 
   bool subset (hb_subset_context_t *c,
-	       hb_map_t *klass_map = nullptr /*OUT*/) const
+	       hb_map_t *klass_map = nullptr /*OUT*/,
+               bool use_class_zero = true,
+               const hb_set_t* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
+    const hb_set_t *glyphset = glyph_filter != nullptr ? glyph_filter : c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
@@ -1922,15 +1928,15 @@ struct ClassDefFormat2
       hb_codepoint_t end   = rangeRecord[i].last + 1;
       for (hb_codepoint_t g = start; g < end; g++)
       {
-	if (!glyphset.has (g)) continue;
+	if (!glyphset->has (g)) continue;
 	glyphs.push (glyph_map[g]);
 	gid_org_klass_map.set (glyph_map[g], klass);
 	orig_klasses.add (klass);
       }
     }
 
-    ClassDef_remap_and_serialize (c->serializer, glyphset, gid_org_klass_map,
-				  glyphs, orig_klasses, klass_map);
+    ClassDef_remap_and_serialize (c->serializer, *glyphset, gid_org_klass_map,
+				  glyphs, orig_klasses, use_class_zero, klass_map);
     return_trace ((bool) glyphs);
   }
 
@@ -2045,10 +2051,9 @@ struct ClassDef
     if (likely (it))
     {
       hb_codepoint_t glyph_min = (*it).first;
-      hb_codepoint_t glyph_max = + it
-				 | hb_map (hb_first)
-				 | hb_reduce (hb_max, 0u);
+      hb_codepoint_t glyph_max = glyph_min;
 
+      unsigned num_glyphs = 0;
       unsigned num_ranges = 1;
       hb_codepoint_t prev_gid = glyph_min;
       unsigned prev_klass = (*it).second;
@@ -2057,7 +2062,9 @@ struct ClassDef
       {
 	hb_codepoint_t cur_gid = gid_klass_pair.first;
 	unsigned cur_klass = gid_klass_pair.second;
+        if (cur_klass) num_glyphs++;
 	if (cur_gid == glyph_min || !cur_klass) continue;
+        if (cur_gid > glyph_max) glyph_max = cur_gid;
 	if (cur_gid != prev_gid + 1 ||
 	    cur_klass != prev_klass)
 	  num_ranges++;
@@ -2066,7 +2073,7 @@ struct ClassDef
 	prev_klass = cur_klass;
       }
 
-      if (1 + (glyph_max - glyph_min + 1) <= num_ranges * 3)
+      if (num_glyphs && 1 + (glyph_max - glyph_min + 1) <= num_ranges * 3)
 	format = 1;
     }
     u.format = format;
@@ -2080,12 +2087,14 @@ struct ClassDef
   }
 
   bool subset (hb_subset_context_t *c,
-	       hb_map_t *klass_map = nullptr /*OUT*/) const
+	       hb_map_t *klass_map = nullptr /*OUT*/,
+               bool use_class_zero = true,
+               const hb_set_t* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
     switch (u.format) {
-    case 1: return_trace (u.format1.subset (c, klass_map));
-    case 2: return_trace (u.format2.subset (c, klass_map));
+    case 1: return_trace (u.format1.subset (c, klass_map, use_class_zero, glyph_filter));
+    case 2: return_trace (u.format2.subset (c, klass_map, use_class_zero, glyph_filter));
     default:return_trace (false);
     }
   }
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index f523e35c0..19060c762 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -1366,7 +1366,10 @@ struct PairPosFormat2
       class2_set.add (klass2);
     }
 
-    if (class1_set.is_empty () || class2_set.is_empty ()) return;
+    if (class1_set.is_empty ()
+        || class2_set.is_empty ()
+        || (class2_set.get_population() == 1 && class2_set.has(0)))
+      return;
 
     unsigned len1 = valueFormat1.get_len ();
     unsigned len2 = valueFormat2.get_len ();
@@ -1434,12 +1437,17 @@ struct PairPosFormat2
     out->valueFormat1 = valueFormat1;
     out->valueFormat2 = valueFormat2;
 
+    hb_set_t coverage_glyphs;
+    + hb_iter (this + coverage)
+    | hb_filter (c->plan->glyphset_gsub())
+    | hb_sink (coverage_glyphs);
+
     hb_map_t klass1_map;
-    out->classDef1.serialize_subset (c, classDef1, this, &klass1_map);
+    out->classDef1.serialize_subset (c, classDef1, this, &klass1_map, true, &coverage_glyphs);
     out->class1Count = klass1_map.get_population ();
 
     hb_map_t klass2_map;
-    out->classDef2.serialize_subset (c, classDef2, this, &klass2_map);
+    out->classDef2.serialize_subset (c, classDef2, this, &klass2_map, false);
     out->class2Count = klass2_map.get_population ();
 
     unsigned len1 = valueFormat1.get_len ();
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf
index cf686c366276025c315aafa8233d2104d824248a..f46824945ffc0ed249ebb349f3ec5ed009acef5e 100644
GIT binary patch
delta 314
zcmX@2HA8EHf`$ASXBh?tfjbNg4C(Fx{=xGmuC!!e5OiT+U^MUua}0VJ$^L|aL8t^M
zpXdwZuVtQ{1mxeC7$Gkh02F+cSe96%l&4b1z##HuVuw7V&Bhf+I9VbO{a>@WfUB2{
z6KEQPD+3b)(_{l-NhL-g4~Rt=SilU%Z(RH$49q|_6Nt~n%EdL=Rj{mn4NwtC#SEZ$
z0t3)73|S0iKoM3Ti{bw_h6(>~FtjjmF)aE&hoK831_g_N^dgWvi2wgN!!#g!&i_XY
zAaOVV>Rs`F62m&M029zAh+T|8yO@EPk%3tVD##3^nSj=UTwfxj$;hyIp3pKT0Kz3g
AmH+?%

delta 354
zcmbQCbwq1|f`#e>txyIAfjbNg4B74h{=sru>s%NZ1U(oS7$ZEw9D`m)vOi&95Ly6~
zPxJ-y*D}veVqg$vnHV82SOXM%l~|Toq?D&p$G{*eFtJ0PF=OM3Bb+RLJJlpM7jX5m
zv04Kaxlf)UB&)^@WHB-@eB%;fU;#53zj5(H*i0Zk7b_Q+$hXOkf@SqrfC@os4lpn=
zlrR7t#8Ai3!@vrJK=A(!!z>`R;QtMVQ~!4{ECY*uW7q-YuVLT<ip^oz1QLUSQ$YIE
zf1o^w|Nl9|J|O$Z|3?fUaX0|#z3_h$!!@t~lNHc<hyx%rBLg$gAuLc)W*`mX0YL+Z
YU<8s(3`}5>d9sI)CL`14BB5nW0P=%P!T<mO

diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf
index dc41ad4b13141802afbe1bfabfc75644fc5f8901..ff8afb9a7ea7a674a7f7d39c4d7d12a85ea7d46f 100644
GIT binary patch
delta 285
zcmdm@)}b~*!9sE(za9evzYPNeL%4f@f3UpC;u;`-3Xp%vBg`@Az0tRq3=9GpKz^Jr
zkiV9Bb`p?(Vq%26paW3wRbp9Uky4&Y9Rq{Vm5Cklj5-@v7;vzBOZcX{`3^@p8@~Vp
z6Hu8B5Ss&8Op_G^B_)`FJVpk_Z(RIfNst0YE-n#~$&2|T>KzzdfP6285C&!j79fk^
z|2Kw&|2G)Y7`PZJKzt|wvBCWR&lz%nYKs0p0`eJwx)_0`LP(&6AdA4F5D}nF4PeWG
VBm)Bzn9TrYLrBKW(*))*0RXR+HZlMJ

delta 300
zcmeBB+oCo>!GixGzYPNe2s5O*2lxle3oa7?@|OVlA3VYwgWel`d&$5cFa^ku^9AzP
zGS5x|^1n=skQdAW3cgA#ODs~#Q>kNM5N4RzA<r1GafJZ~3m4n_i<|Fol(X@RFfap^
z833^r5W7x}<Co=R0<stx7`|~$uHu)TJefbDK7hdmC>F(##=ruEK=A(!LlKaw_<w_8
z8kql$p$^DyVc>%BL1I7vl7q-UXXyI>jbXz7M?gL!&`w4MCNK$MGXr^yU~z~HP+J2K
eGcW>4ptvNE0xAG=n80k1G|-6+o6`jrG64WKLOvG&

diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf
index 749daaf4dfc3d31aae854a5f50ce0cfb520c1bb7..5e81cb48687a324353e0c0736e856248a89aa339 100644
GIT binary patch
delta 226
zcmcbjv_ffuf`z}4nF0d??+OM6221w<|6qC71rLGzCqVuRk1)redzL>QGcfS=0Qu3r
zK>k|h*-1eDi-{5Pf(byuSBYhbMM`-pbqovwUnX|QGx}^?v4D+*<G<V1%|7hKY|1<g
zj6h{F3``)}0SKXh8At;~zH#w0O#a0i>8ruu0u(V|umGwA$ua!@#^A)j#oz~KKWFgx
g{|Lxt1e*gg3xpw%3CsqX)&Nq<1R^(Y;ak820C3wbbpQYW

delta 242
zcmZ3XbVX@`f(2j44?YG4-W3cC3_<Pz{=xGl7ybwG{{Z=WJi;7<?pgkL%)r361IUl|
z1@hN2&rV`s;1`(~Aurei6nvFfmRO{er&7njAgD00L!Pl><BA1rEL|)2*KGD-FJ|Kw
zU|<3&(*a`B$s70-`574)zA-QZxr_{q-?;cEKjMu{G+}T73fM5X0VP0E4FBIS1pL3j
t0JI6n{>Bi-zy)PLXNdX#2*_pxnhL?FERZM=G=Pl<lT09Ta|ho7CIE2bHlzRm

diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf
index a178115b45b4d53f5c032e4cea6040087ee90ab1..04dfad564c6ded5bcd3a0c04d678519ec0812225 100644
GIT binary patch
delta 253
zcmX@3yhnM0g2k^dZZ-@IygL{e7?Rxs{DbBElsXs~_+)_me;#3uLGLxcy<}kE2l3;4
zf&8`1vy*`Qnu!r|Li}HVqOTIm5{s1bRO%QQ1Un{n$TL3JxMB$#OW)N}rOg5C2iUk7
zfr^-bm{Cq{vOHf)y#s>_kmtn^!obYH0%S2Ta4{tOuVYC2KZhX)#QopFPz0i3;Qu6s
r3K*M#5vYq1XdZ-Q0<#%WL>U^u_5n$tIv@$8!6Zl=$lk2SKaU9jS$Z%G

delta 257
zcmdm^d`5YKf`#O3xhMt(-W?1K45{t`{=u^Imgq4s@F_4bFmic>IR?Gg{PvQ8fnNtG
zALk3?uVtQ{1myQjjF1x&U;&E0N-Rq(Qp!`QV_*=RF|k9Q@x#UyOW0U~+zwi74q!jP
z#?J&)1j39W-{j;N7$!^ewbTbNxBx|>fRF_Uf#ClQhMfN!7+U`CVn_q=8MuJ_I)<YE
za~LW>-2WX6KnoDy|0ISMIFFHmnSl{#2Z%(lfp#_kZ3UA|42)nl6OaUoZ5HBR#RLGo
Ca5VP-

diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf
index 96374c4b76a25827f970a6cec7d5b393957099ba..5c166ed6440361cfdb18bc8a2205adf06f9b617b 100644
GIT binary patch
delta 122
zcmaDO^Fn5Vp?aSDb_ND+9|i`77LPE;pl_NC=YaeRKz@WTkiV9Bb`k>vkH*9ZdBFuh
z!B>f8iA73zDs>DDd?ph+<QaQ5t`KBl-e*+3c@N8THhBpK7oaLR1|<eY1|}ejfq{!b
P3&;jRAb;~Q?qy5>;ny5t

delta 126
zcmaDM^G0TZp}N2PX9fmt9|i`74v#R$pl_NC=YaexKz@WTkiV9Bb`k>vkIuvhdBG(>
z!B>f8iA73zDs>DDd=?Ws<QXSyTp`H9{KxS1<~=OW*_0I+T!5<7fRG6Yf#ClQ20akX
Pzy+ikL2&aS?qy5>u3jHs

diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf
index e17e1ec73404af278e0228dea6010a8ee894db89..43a416592bc2ba6ce33f73e63268be7f0dfbc6eb 100644
GIT binary patch
delta 237
zcmX@3yheF~f(1jph!Fz=?-vFJh7k7v|6uvM3$hp(_&k986CPoXLH8^;-Z3!n3jq1i
zzCiw3=GjR=e$K=QIU)WhK+#u;Wr;;fc`9`b41yICJLDNJY+Uh#jin>}@3zeo*sIyN
z1sIrs%5;F(Y_b%etSE@b$iT?O4<s4Da*SMDlOy;d?SmLxz#@DMGC(<||2G&oKx!I5
v>Os0VfEdJMV$cAqG+?j*vYA1m|DQ8BP5#3tEyx5^3xOaOP}gQ1{sl|`3k)oT

delta 265
zcmZ3Zd`5YKf`!bjPX-JOyk8g?7?Rxs{DbGuQ<Py~;EMqAZ+L_`2HmsZc*nrN4^+bt
z?F;0uWuBb`<o8UBkP{MM0gAp#EK4j>%2TOhU=W-!u|uBm!^Ra)*jNJO?b|m`V6SH5
z7hzxqDgzl{3B=BmP52dM85tP9F)#tSj0}ui{9qQC$HgV`jbX9}U!->&g9}iaiGhzn
z2B?VX{|yEXkg^7l7LZa7APwR%F_?f=+A!Dv?E%@u@c#{i+y7k*K4A89hM>t0_@qTa
Tx*$3sx)_0a88`FrFJJ-y><%+-

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout-retain-gids.2E,23.otf
new file mode 100644
index 0000000000000000000000000000000000000000..849a7c5b1ea6ac647aa08fdca20baedf304e0bbd
GIT binary patch
literal 1944
zcmc&#YfMx}6h3#Kmu2OlED9*BJS<d%y>}NDs8$fgh*~UYqiu?8*=1H?S=a>?6|1nY
zZ&)Z$5MQL*CkRH-TAxv=ucoQdq-sK}Nt>GfFi}H$7cUK+%Niw3lcv9VCNuMW=bSs|
z%(;`9g7xbQKmvP#5Axi+Jb8YyS_S~a0D}CL>k5h>0;B+98`gys6s6J?gByAQL~}4N
zDK%)SU>ETi+Xa|w^*W9Ao1}}M0|+sNbUjvtjERn7K8AU`-cYk6w1aQKJOlG{2F;Et
zNL|PI4&W}T)EIQ4%IJ6ucVO<QGMZ~94+D+Y*JCaRz`m&f1PFLQ5QIouYcSMtD9aZN
zzEy-TpXbZx`{oGPP$@t92(&t#{!uEP2QWA`qmLCmzdF8B$ov#M>U(=8^K&RD2!byZ
z2L#Rt4xJSqF*hbQA#q^}rBY`t$<EDNwWgqO!^ZcDHCnXQP-Wg$xBJ6}Z*L+B(MX9@
zC=I0}HOfGlh*BVmLKKZCC8AV_N<&mSqST1WKvX886^O>)(1=zdT7~E|M5iNKjpz(S
zXCkEnDJi7HODd64g_LPXnU0idq|89dOr%mE6@^qZQsIayq)J1o^ju?AooNfw*T@q~
zljO8QLCbTr#t(GzqB?Vp&R~|Wsw_2{s*EO0jZT{)&#9=87jo`qd7;j%Gi}34f9Y`T
ztcxHOmr_gyNCKrZf`UUrXU+<fh0mT75g9diUUZCner#NP!h+Wl7p0^sC|apXOII(B
zm&8kg{$1pf*y(QbC2^7<lXpD9%UZq6^6txCw#zGGhP)G3ym!3$Uh&^;<SSc1zvN+H
zzf}6rBb|Z&Wxz<-)F>OB1wwonpqp4o9OotRQXcv4$-3LR+k09s^)hQ*9a*kDwmr7`
zhGI6PUeie0?Jh@@U2NFxDIK(4YrbJUQ}Q621vWBsd-l!+ziR4h8!dI6+uU}y-DU6G
z*JbN;lWw=e71e9mkJ~`~K>eWQS>5PwXYXHlu=??vLspl~ZFL`L@9o(C@xANie=I(s
zIKzq?6s2U9`C!>lJLyZFxF-u_ei;|bmMvP6y5jZnVy)I*<lg16^jPj{neg7Ho%YT4
z&5n{*&7~Iiu<NuNH?pnG>GH%3f7EnIV<YW0hdrv5iLx;f?=rLOEjFBAQ(I$egM(~p
zvRSP$b_XXUyK^F0*3r|})6w1g$*~Iu`p$lL{>J$mU&Ojto|Pq34eaban+}t{Xx1nT
z93Bssxo|lgkrubb(;U4&Z+YzX;@g{;t=G=7WXJXvv#oXy8@5r;N}F_!wawK>EBm$@
zd$%6n_@ncx`+?`~k#o05?~wCs*U3Y7N=|7`ul<2lnwEaL{nXc2n!bP1^R)Sy<5;`%
zq`r$KaC{F7J4uJj>2yV!28yc>>PX+hKhtD^zPRy38FH6(>KobQ@*;L#85^l*!!NVB
z%zO=_c%O-4+Ez2c+WY0Ute$EQsyFXLyNz|#)rX$kWWpKIL9*ZTRb&5)P$b*SPRK5f
zFiE#hvb+KHo9qTwIFR&Z<+IjD9hM$PPY3BsU@zjZHm58Q-ztQ^SKPYWvN?G1??4Dg
zu?BW09NWvy_dmNi6T&B31T^mirhMRWT6}|z63Kq_|BwGAmnmPo=YSEM_w^~(Cwyb7
z3ez`|3cP?3!h<hzDKSQj!E>OeX22LD0G>p|7YPG-JnrV_YWPxemM>cY*$@XQ{utc&
za49i4Imt!EEC)AEMDP}_Cm{&H-$!EZ$2<ta%#Zog^nz(v2w{-;!bdcvM^FVuFypsk
zGf=pfVO9w>poT)w0fJhn01cSn9n4JFZ_AXOf)r3p<-+4u!zc{T5<D*k0gk}sD8PCi
uw;L}1m-DMV<JS=j=gSFqI^w4F6pa0yj}ey11KfM|55h&4;I}r&Z~F`4q8>v4

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.keep-layout.2E,23.otf
new file mode 100644
index 0000000000000000000000000000000000000000..7ffd4689adfebd398b37722bf4ac5e3a2b36ec8a
GIT binary patch
literal 1508
zcmZuxdrXs86hGhB*GF3cm9hyDtKb5YA>wn6DfrBE4g<QV$$*ZQR-v@CMa2nID70VO
z4+<-cT3=+{lMal6b22q5@wF^l)c8mU@sDL@e=JeM_7yKncfOW5v+UfQd(Q8ibI&>V
zCifI=+g1c}I0Pb4uidagJw)%e0l*-DX!FLcMI|r`lmL>uXiF?AS(sPdzdZmT)*>#i
zFlx-Oi?X7BD`Krdr_p|&b?Hm=BZOrJG$f8oKSo@DIKyDH?Uyn14#X=EGe*sRGl+zv
z5JHyLXpA~(O<D%}M-aQrCaW!S0`f3F_5*4Fj1>V;Af|z$D5<v2Xsj2smEi;k&!)m@
zbT~~EepO7SD@AE1q229{?Mm5ffd27my+r!_+Qdc)zan9jFP_2YPX{qYiDjFL^oy73
zmn>UrGS^#n>kT$_W<{1dFE=+&U8psEs8g5JTWva{RsBv)g~?(zSu{4CHb-4pU9Bz_
z!ma9JomFSqi^f<_*p!0;5%#D^%#dfu<JIzc^7y&(ba}ibI59s+96^3v&y^tQ4odlf
z;N;cdo#3XR?7u$dUte6G{E?zhseI&BPQ%N@jU+{P)#yx+;A=n+wSYQJXVE#2!w*zF
z9X*}?_R9hOU5{_2r_tHyY-lPai4B@&hGjjjR90p@=&k5?TyMSUIA1<iK!BvYxv${B
zYrkn4>YDBKU3)o}V?Auw;cjOa$8em>lNzue!4+x<HT2t`)sOx@{P5z~=08>qI6O|y
z!5!@k_>O$~;6~M7`Db#^6IoMk1!J}zs~qTL!r7A#R0{sr37Klm8*eXM|9VxaR?C)f
zA9?M5`+Y5+9C+Hrma%27@^;PTHg3>!j>E-tbhtg<IfI|HT-G=l*6CtX+xb){KWi61
zlWlWie=Qx&?M*JGrN!xR%wb&uG33Bxw#w)4@cViKpPjmRw0HQ&3pX#^{A!+u&<;W^
zX(F#Q?mWSS(}+o>7@SB}dGI-0DR$28ZB09}VconNrMGwTd#(=?#<#D{>a1%dNjnTg
z*`jl8X|4UXrgx7iu;=uSd+ux8nD_q4AAVti1McDOq2qVT&uY$X`I#)Xtp0r8+3&8l
z{Pe{CwDp<mRHu8$&`l_;?<H`6ae3TsPl_c}T6;{#gctn1RHX=~Ph_g}TxFM`nPgX$
zklB?a#Xyp;khT0=4WIh~pUQV^<`c9JtDGzSwO)OL^|1b+slK-M_>)_FGA}*G^m)H&
z?wcybkN}xfT^ixDZVwSUw0srWP9&kMuWO#QKla)EF29cn&nK6#tkbPh2%jm+p?mg<
zvV{CUfs%}(1rE+Xbx4p8zqmC6k|S;6Jo*em5zvAaf8;2YEiB=DobX$32o~s-ycNwD
zjhWggpyNg;FGxU1jZ@?B9P*+PP)7}bmP<uaiGrquu_5&Hf(qBISq}w}4mq(J!v1JA
z6^TTIs)!142_%L0us2E^hv!oe$8;Lv5yf=TOLp-~x&)FSb1Fs}wd=tQCa~h%DT77G
zm56G<2FsxsbfAYis0IyK;C)0EjN2XcFM=G%jrKwd*-%SDDMy))<1iDY6eYfea2uij
tn2d}??!LG)PFf@(Rv_V})2CR-movpe{wPI`3bXNlNQjo>+>Vd={sE9j=3)Q<

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf
index b34a49fa011689689137f23264e67276a469fb7f..15aae117624f52c61ee77280f203034567d5c4cd 100644
GIT binary patch
delta 156
zcmeysyMS+kBKPDM)eH=56Brm6CQQ^(VcD&rShq3c471FS%0(07`E9;3FtXkON;1@_
zZfF3}x0h<a+-$?r$rR1Rz{Q}!z{DWIzz7ug141Ss1cU!`fMSdcia@>$SXPC>fPooF
WmI17S38+FDtd1G1iV4gH>I49gv>Yq|

delta 108
zcmZ3$_knkUB6sEUR}2hn6Brm6;wI{-u<X>_&ATz=471FiRRzc6`E9;3FtXkON;1@_
vZfF3}H<ul)*lfen$)wH5z`?-8Ai=;06qN%)CLjcZ|8sz1j0}oU43q}|uY?!>

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf
index 2ad1d293d19c034e40e42b9129f0eff255039698..4f7f45c512933e8e1e1619c42f944c48f1467421 100644
GIT binary patch
delta 156
zcmaFEGlzGABKPDM)eH=5JPZsB6DI1Yu<X`QtlJop!YtF$y+JRY-{va=BkLWYBtwnr
zh6WIQd#U!z%~zOnnWC8(xEM4Tm>47&7=hw`K*$7yVDNtqP>hj55y+PT%c?LKFfb#@
VGJsVu0aYl2)iHxrF@f1YodDw28u|bL

delta 108
zcmbQk`-W$NB6sEUR}2hnJPZsBaT9e^Saxde=G_>Q!YtFVr!FO)-{va=BkLWYBtwnr
uh6WIQbJ@{~%~zOnnY0-hI2f21Bp4WhqH;jU1cYGle-2QLkwFoPf${)56&B3^

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf
new file mode 100644
index 0000000000000000000000000000000000000000..5cbcb37cc9b4c5eef2b63468e1a66017cb6f0ff3
GIT binary patch
literal 2024
zcmc&#X-rgC6h3b@9>WNt3@RuNAQmgayf?#U-4K_ES}bUzZHi8r@s7$cFf%TwP=$fn
zVX$C9T+^{>3odc15tq2st!dh5QZ*&krcJFsOw`c6!DmCyo3Uz|CQX0!+}wM<@7(k5
zIrqGqdy5w@E(SSl0Wqiw=gd(RW#lRW;240UXzrro(jPbcS_}~3L|a*LX%<^?a7h<{
zY$Wm(<tAMfY@#0Gyac)4Xwd0<)067}q(~vhh=!s4vIEHbk&iQ)Y#U<R#CGI)$WNPe
z8>%2{k>J~dT~?_x8Dy17sR%b9cUPIMw!uBX;`&D9DggA&0-!)50*az!`n4ugjesTx
zV<0$>3KofiMdIK{2_LHvC+&q6k0(4TBE|q5>>sj^mp#2aFjva`5YrcYYZ&)aET}0;
zERBea8WIybJbu*Zu_<Zk6EhiY?&PU63g^sQP+YQP>APh*Jy~t4vaYMy{6YPf*9k*d
zq9Iz6O>#&s$s_rMQ4@wC3`-adVYGzFCQJ@tatV`1n0&&j35(ybgw+sMOW16}<`6cQ
zuz7^dCmJ=;Fhqk(YKTTlG}%OxLo~TWlSef9M5`uRhG<!$#fVy>%_iEMLUUD(Wfd{n
zRO#gtRIFOfstWYx_YJDj8mrA<va04)mYXeAW{b{d&}XU&Dk@YZg1c2!Vz3%4>(Cf3
z9oEh<39_)15p<+HN--olW@zlN;c?3N5hF(>B#s`FG**?Ik~%JJ{A=lxGPBeStI=lX
z<W3nUA19CgcTvexUUf^Br^=%(fq}FD?+9?SIxYnG?Ex8gDDdoJ;AWsG5b^gp`sG|?
zxBOmIw?c8xuNZ>=GV)SfXjJwM2Pqx~=%6N2M?@1unfHUYl^v}e+d5m$cX126ZIiuq
z&N^ppeHlNrR@XqgTwZsgE5fwdUw+VWrRkdE)QY<^c;FNA*U#8E{uf>C+6H?~`#PV?
z=kmJRw{CZ~`)Hrf?M>{m@4(hm+f#ec{-mbwLGPWjcjrHxcF5s%`W(KU+q&9ze02Nj
zn%}1!RiEM`>ec0Rm37z3L)++J#<SbXDDLNh2<6O4Q?q8jzNSpCca{1!`R$$dTY4_O
z>v6klxof$5MT_oyv+tPqqz@b2+UoK8#~%Bz@x0DSyPR%UVhfk(<VL;24R<v=F~7#v
zhL(Ca-Pq`KIL5l%g3$cNXBo=2&eqPhj;@anpWV5y_p3A4&RqL6#mkEvJf*GYN7OCb
zLkE+1voh+~K)lk6<!~q1eRh9S(vCT^Qm&TWSjMfs(#z9r>zl34wRL>lQX{WuG`JTw
zRUfF_x7ysb`pDAnJePfU{kQg>{+13L^7L*$zWe5i6S|WNzu`5O>HF88_~K&Y*N-|M
zH$8D5-sU-O+|E-N-_OHF+U@mtya|?`vg%z1Iymu<Y-Ln1bs$|yd@I|H4SdF$Qhv-z
zKEcSxU*HS5WF4n|k4xlQ=W{XoJ8PViJFESq*1DB!HrG^F?|yWhi|1s!=x+b#4c*T}
z(R>&GOnL4SH{r%{UeuF2jbFk`dnSBV`K0B3o4wQB*+vJ`_;VQ6=}|`EtwM$SCvk<*
z%VVbe29&f9EwDN5@D@RTzklKbh#zd0u%e?##UK)_c!Tv(8DaGQkN+i?kT32z@)G8K
zHN^Hw-w0LV)s19<DDo2J$BSG+^;7-u6xfgk#E1Yya+z2rjS`83n_sBm3n`d2b2iL?
zRLBg+5XO7cslmZPAu6&0Y=X$(O{^y+iNx;{kcY7dqLGEM_!Yb46)c4~NPq4l3)u-&
zff=m$RxA(omB=c=2H8*o1|YB&DnJJocpI4o{Z@tM8OQ{6C>N2i8lpJVa@12mf)Ruq
zC1@83yAkq#p<nJ<fmR6l3R*ZF_<p_UnTW$(j0k0Lr|_Qrg9y>(kOUb(Rp@M$Kx1SS
oj4I4fHiOlMw!hA+Bov84iwJWTJQ5%Uv48|03Nr|IA$ycR0bEZdKL7v#

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.41,42,43.otf
index 5d9fe7725d1f833e79c8d7ac427f87e27a07d211..1fb3d12e8a8402c61dfc9d01340f5d8fa66d23e5 100644
GIT binary patch
delta 49
zcmX@Ye}sQR0LyL-#k!3lOIT!dSTEd-=ePOFz{q-s0SIbTH#C6g+e@`yZWdwPzytuJ
CI1m^B

delta 49
zcmX@Ye}sQR0LxCz-Mkw^maxbeFwNZ`&u{aUfsyqN0}#}xZfF3}H<ul)*et@jfe8Si
C-w+r8

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf
index 88e60461ce4a37fd398b4f2aa9f212408acd875e..f2c35943d17a894e5d266a4166e02863922428ff 100644
GIT binary patch
delta 156
zcmaDNGevfSBKPDM)eH=LEDQ_`6DI1Yu<X`QtlJo3!Y!j(wyh?f-{va=BkLWYBtwnr
zh6WIQd#U!z%}cnaGDR~na4~2wFfm9lFapK>fRG6Y!QlTKpco^AB9JcwmQ`UeU|>d)
VWdN&S0;*63t78VMVgj>)IswOx8o~eo

delta 108
zcmbOt`$T4fB6sEUR}2h%EDQ_`aT9e^Saxde=G_=#!Y!k@yk%27zs*+$M%Ft(NroEL
v4Gkdr=CY#|o0o7;WzuG3;9y{4kYHd0ipl{Y6A*&I|2aT0Mg~PF2Fe2fDohrY

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf
index 195c8dc32458d8e15c250210cd2c926a313febd1..965951353a329cfdf88b955af58d907cc298a4ed 100644
GIT binary patch
delta 141
zcmZ3$eSv#|B6rdAFANN<4h#$oeG_$5SaxeD)@=;oU}oVFXL>L>fmwv*_EPPan=6?A
zGDb5oa4~2wFfm9lFankP03j0)g2DeeKrs+xVvqsLsxas=FeAw_fK@PoRY25%)I#(C
GO#=XD2NqHQ

delta 93
zcmcb>y?}dyBDdx9R}2iS4h#$oaT9e^Saxde=G_>=!OSAidVy_n0<#Fq&1FX`HdiqJ
fWz=S5;9y{4kYHd0DwYF6CLjcZ|8sz1$dCa5VgV8*

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf
index d10d3621bcfaaa01116c5ad599a9583ede331bae..f49296ce1c447d625542400cb0e80d87c41b1066 100644
GIT binary patch
delta 140
zcmZ3%b%SeyB6rdAFANMUCm0wQ`X=hAu<X`QtlJo}f{DdDa)S3HW)YU#OSNBamSBF$
z7|q1M#h}5!#2~@I2vqF@giJsP2LI;(#XyjWK?W?V!l1{%j3mndR>1^T0Z|813(*5K
F4FJq=7bgG!

delta 92
zcmcb?wSsGcBDdx9R}2g+Cm0wQ;wI{-u<X>_&ATyV1rv+^iP*wP%pxo|mmRIxEW!Mg
eQJay0gMo=bf`JjJRt^Z6fDjD+&jE@dLk0kzU=sQO

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf
new file mode 100644
index 0000000000000000000000000000000000000000..e2834af616e8955b0a73d245aef55441c95fcae5
GIT binary patch
literal 1588
zcmZuxdrXs86hGhB*GF4HCuJK%te^`_h72Ebjwy(bOy@A5i<%7RXlWJtpe-s+m_ng%
zD6BAQeUa5<8w`wsGcq+Q@v&vuqGoDFh|3n8e=JkO_7yKncW%p^S$1#kJ?Hm3=iYPf
zy}74o)21Sj!afjyvT)5B<q*5w3IKxug7s@R7M1+8=+`0u(M{w^i%J&cR`+iX0tnTJ
z%PaIM6KrEFXy1rft<$K~!x?iL(2fw6=#ZE`F8&a4KH|ALy>+*QW49n)ikQ=@cAG#z
zmqH&7u|cKRhz+UfXdglBG8rw_$PviJ{V^X<0-&z|fB_*348w@kwR(LW)s}@5AUul+
zr?TNxLHGqBnIRXX9)&iyJ2uNDvjF<Xr}Yr=lgkrpMf}o)QNH*&K5qsH8Ad2sSEOCI
zSi5LRq0v-l-mcYIl^GS8%G{isTxEgU_`XJ2QfIMh^cLk?h6<zEWHhU+8g;g^pt@RF
zOx-QYVvR*(-ic%^CrrxDfB<upO`j{BD~(r5)1>ipr0LRlb7*2-h}c8?s_u&+(iIZ(
z1EI-Fp&OxfA<2Jj+`qQCUg=#~uUvlDC!dCgi5p3b&Wh2QAi~>#Ze~7ng3V;J?}u+I
zy4$-u0&N$9{M#P?GEak}!BO8>N~YJVnmDJ^<4SQ#^m~03{q`#@*X(D?$MOk~<kxrQ
z?|JE-s=l_#R@b@H>-0K3&d&W^j!rM<^}0MMLE8cBef53y{kF$-qYsAfoEuyJ+wuXs
z$Kkbm4|W9o2R^=iwd&8jlR0OIq%o(0Gg%H*4s>wgtjXI78UM?KM6vRfHy5maxvEsH
zc9wWQ@Yw>kTWUTj_^8ua<}7oSx2Z0)dIvqHz1X?-cDKhjd+?*?3n~Zabhw-;ZG4J@
ze{mZ>)7k34{F>XF+8SM4bF;&4pY3$f#*safSqgukJ>c&SescWW!Jgr7&R#ov?b9?5
zVeN!j)JUFh*m{HurxK$=HaL-_@Zfd0l5Jj_uO;=snpJ66ORsO`cU&1JoPSrV#ZlWp
z61V7xyjkPg&{Fe-p=XCNxZ}i@AKaI{W4>EQzxtjF4Y-H9h7R8-Kczao;XAU>yyDod
zQ(s<c{`O(uQOjf3@ecQpu8S}j-$!5%=kmDSo@8@hY0V)G7oPvuVudW6K9Ql&dMi71
zO(d(Tgv_cW$vTpBkreWCRD8~Rd<x&bo=;HUsd6j})cCaZmi^kj#=4rC!w<jalX&qV
zuGjZ@Q}0wLjs(f1;`|7od3}hmeXlJin~A6|^E1Qaw)=itz!mUw;d$gdhIP0VGWwaK
z<6h72KbIxs{Q-<<6dBk%@Ay6{e>^t-0VG9Qg}LlWgaTkGi$8Ld$)cUEkE6f!DrKNY
z^hR{YsL#~I02?>L_&@}5W}F#^Cy*PJfI4abtW+!zi)1WI%LdKoX)9Q@ay8^bI%LOU
z(E08PCK8FzsE7)%(<X*@FgHdRhwGCO$8;9r5yf=DGraH_T?C1cG36tU@>(!~5iD4D
z%A%tZkpZl*7>YpyTBwC;P=OiVMPx?5?NR%ykPSJ}Tv)mrYKbVNDD$u!W}p<K#JixU
zq4~#TWGr&?>6zuoLe!T^dec}7ql503JvHe5(H1#KYvcbk>Mey-z}Kl(Sq;F&3Nl8e
i7RIWvSdshZ?S;`u3^FX{Og)kz4RxwfpJ#jY_5TJDqwib*

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.41,42,43.otf
index 83e2e61dacdf93e40bde603aec565b14f1a36713..3766e7f65f9a7610ef555d5f2ddbe9f1a67ad27b 100644
GIT binary patch
delta 34
qcmeC+>fo9Xz_MFIv2J6?3nrEngX!lcJ1~o|++M2va&rXp21Wqaatyct

delta 34
qcmeC+>fo9Xz_L?wH}A%f7fdV}x+xnbJ1~o|++23FVsixZ21WqbaSXTs

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf
index 88e60461ce4a37fd398b4f2aa9f212408acd875e..f2c35943d17a894e5d266a4166e02863922428ff 100644
GIT binary patch
delta 156
zcmaDNGevfSBKPDM)eH=LEDQ_`6DI1Yu<X`QtlJo3!Y!j(wyh?f-{va=BkLWYBtwnr
zh6WIQd#U!z%}cnaGDR~na4~2wFfm9lFapK>fRG6Y!QlTKpco^AB9JcwmQ`UeU|>d)
VWdN&S0;*63t78VMVgj>)IswOx8o~eo

delta 108
zcmbOt`$T4fB6sEUR}2h%EDQ_`aT9e^Saxde=G_=#!Y!k@yk%27zs*+$M%Ft(NroEL
v4Gkdr=CY#|o0o7;WzuG3;9y{4kYHd0ipl{Y6A*&I|2aT0Mg~PF2Fe2fDohrY

diff --git a/test/subset/data/fonts/gpos2_2_font5.otf b/test/subset/data/fonts/gpos2_2_font5.otf
index 63af3bca1038941a1de1175f524504ceaee593ad..19833cf8fd17abf64c0fbf2ea796ec23c47a6b51 100644
GIT binary patch
delta 202
zcmaE&JVRxIB6r)1ZUzQ{9SjT%lP2n@u<X`QteY63%;+<*!bYZbr`y(eew(ihjI4Kn
z3K(isH#C6g+e@`yZoKf3zg~}lF(<JkkAZ`M1tk9eKLaC>Vk}85E&+-$Fff65K*$1S
zF)?s4XaHFfU{!t$en2)z1rYq716HR9<ja6%RTvByn2}^5Dwr4)8I*zYia<G_O+f9F
I`2?>40OU3$9{>OV

delta 166
zcmbQC@<e%pB6sEUR}2gSI~W)k;wI{-u<X>_%{wtfnNeb5g^f(-1yRR%ew(ihjI4Kn
z3K(isH#C6go6C+?Y`pN1KT?N*F(<JkkAZ`M1tk9eKLaC>Vk}85E&+-GSzye<zyzi_
nfV2cyOpZYg$Oef5!T&ixF-8VOC<f|by)!vL@E8lD4g&)K&_N+$

diff --git a/test/subset/data/tests/layout.gpos2.tests b/test/subset/data/tests/layout.gpos2.tests
index 5d3a0bb6e..08799946b 100644
--- a/test/subset/data/tests/layout.gpos2.tests
+++ b/test/subset/data/tests/layout.gpos2.tests
@@ -9,5 +9,6 @@ keep-layout-retain-gids.txt
 SUBSETS:
 !#
 !#%
+.#
 ABC
 *

From bb54e1047d2d501459bb366e47f24f51824c8db7 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 16 Mar 2021 13:19:26 -0700
Subject: [PATCH 2/5] [subset] Also filter class1 by coverage when collecting
 variation indices for PairPosFormat2.

---
 src/hb-ot-layout-gpos-table.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 19060c762..1157d16a4 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -1358,7 +1358,7 @@ struct PairPosFormat2
     if ((!valueFormat1.has_device ()) && (!valueFormat2.has_device ())) return;
 
     hb_set_t class1_set, class2_set;
-    for (const unsigned cp : c->glyph_set->iter ())
+    for (const unsigned cp : + c->glyph_set->iter () | hb_filter (this + coverage))
     {
       unsigned klass1 = (this+classDef1).get (cp);
       unsigned klass2 = (this+classDef2).get (cp);

From b1b1486d07f8fe3c7a1fb4bc87e6f037ff5b47d3 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 16 Mar 2021 13:32:23 -0700
Subject: [PATCH 3/5] [subset] update expected files to not include cmap12
 pruning.

---
 ...Roboto-Regular.keep-gdef-gpos.1E00,303.ttf | Bin 2648 -> 2648 bytes
 ...Roboto-Regular.keep-gdef-gpos.41,42,43.ttf | Bin 2736 -> 2728 bytes
 ...font5.keep-layout-retain-gids.21,23,25.otf | Bin 1824 -> 1816 bytes
 ..._2_font5.keep-layout-retain-gids.21,23.otf | Bin 1692 -> 1684 bytes
 ..._2_font5.keep-layout-retain-gids.2E,23.otf | Bin 2024 -> 1944 bytes
 ...ayout-retain-gids.retain-all-codepoint.otf | Bin 3732 -> 3724 bytes
 .../gpos2_2_font5.keep-layout.21,23,25.otf    | Bin 1488 -> 1480 bytes
 .../gpos2_2_font5.keep-layout.21,23.otf       | Bin 1368 -> 1360 bytes
 .../gpos2_2_font5.keep-layout.2E,23.otf       | Bin 1588 -> 1508 bytes
 ...font5.keep-layout.retain-all-codepoint.otf | Bin 3732 -> 3724 bytes
 ...in-gids.627,644,623,62D,644,627,645,2E.ttf | Bin 48640 -> 48640 bytes
 ...-layout.627,644,623,62D,644,627,645,2E.ttf | Bin 13332 -> 13332 bytes
 12 files changed, 0 insertions(+), 0 deletions(-)

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 b7411bb4dc2279f96e90b5a4b37fe045b4222444..a398c6f966dd1fa9b589fd66748de158b0f766ee 100644
GIT binary patch
delta 59
zcmca1azkW-BJ-)Y^Eaw&WM+>3zH9Rh=2$jm5e60p1_mhxIR-`sCLoIeNHa39g4rM%
G$O8Zee+u&e

delta 59
zcmca1azkW-BJ;hsOE#)(WM(%0zG3qX=2$jm2?iDh1_n7GWCB741|cA3U|<A7Rw!l!
E00u$|^8f$<

diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf
index 0ad2532589ed831605db5bad8620aabc6eee4225..fcfc584b747f27441d978d9c8e5727e5d892f1de 100644
GIT binary patch
delta 89
zcmdlWx<Yh<BKMWVRSXQAKNuJo)@{_e%gh{n{LE$^7Ed;L69!fW6$TFmCZH4}0|$^+
gVqgKXbr{STm>HNSS8>UUG66-IfU+RS3{}Yh0B=?eJ^%m!

delta 123
zcmZ1>x<Pb;BKPyeV+;(OKNuJowr$k8%gn5Myk|2Hizi#O6$2}S3WEm&6Htngfdfcu
rFt7mGMhtd9ni<GqU=U(p`2Q8mLJ*8VIYyvr5D8&319=cO#4H8?Ta^wk

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23,25.otf
index 15aae117624f52c61ee77280f203034567d5c4cd..77c408cd17e4f96a201731feb850ecab94a91242 100644
GIT binary patch
delta 107
zcmZ3$H-m42B6rgZD+UI(2@DJj9UFDNGBeL!EWKHUWhIlh2m>QfP>R6~NHZ}o{GS7)
h85tBoY#^2Z%PKHv0ND^(hzcg43T2=i2t(8ZNdSBX5IX<>

delta 115
zcmbQiw}5YgBKPDM)eH=56Brm6CT!IC%FJB3XyRrSmX%Dw5)6z$K|dg50zxqOKL;qr
j$e;-1%YbE77z`Mgkz^UbDwu#Ol)>tl!K#?RY@kj6LNpOV

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.21,23.otf
index 4f7f45c512933e8e1e1619c42f944c48f1467421..9abdd3204421ce38d15c42031d7497f2f2d3fc64 100644
GIT binary patch
delta 107
zcmbQkJB4?GB6rgZD+UHO9tH-6j*U9K%*<;y?AW}AxtGaXgn<z#D8=9gq?s5P{?7r@
hj0}n(HV{jIWfd4SfNY2?L<JL2g)&eMgdysIBmjpd5PSdt

delta 115
zcmbQjJBN3IBKPDM)eH=5JPZsB6E^DfGBbB?(A&I+xtA$ef`Jhz=m&&MKnMo^=K#eR
j85Dth8L+Ghg8>6Gk}LyQ1rtz(GFTlmSQQhP4b%w$^{5bp

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.2E,23.otf
index 5cbcb37cc9b4c5eef2b63468e1a66017cb6f0ff3..786de302894f08ad3ea95f87769c3b2f17c319ab 100644
GIT binary patch
delta 43
wcmaFCKZAdQ0uO^E0}lfOdj|spgTO|eJ1i_2SA-vJ=3#AS;^blA1BwCx0N7aweE<Le

delta 123
zcmbQi|AK#l0?)&W7yb+k>>UgY3~?KE?y#^d6LIF-%){Eu6e-7`!@!u6Sdz!U!N3BP
xXZZi0fe}bCmZTP!0L6eTFlJ$30@EBoS_CX6#h?UagJeN!7#WnIm=Ua!0RRx;5Xb-k

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout-retain-gids.retain-all-codepoint.otf
index f2c35943d17a894e5d266a4166e02863922428ff..aebc39673a8aaf5d911945218a25d64c595aba52 100644
GIT binary patch
delta 107
zcmbOt+ao(ck-O=I6$1kw3j+f~$3~r4Zsr-=**5oZZ)NfpVPFIbN-?+rX(k4S|8sye
hBZDG{4a5>)Sp^0SAR8hJQNaXMp$wD*VTgJl2>?P952OG9

delta 115
zcmeB?ogzCyk$dusY6b>A76t}}2^)1{xtYth)okwJ-pUj#!N3R<^aDaBAOwT|bAV!u
j42nR$3|Ll$!GM7oNtOYuf(fWX8LW;OtcnTD2I>R=1Bno;

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23,25.otf
index 965951353a329cfdf88b955af58d907cc298a4ed..f227d5ad605e099e9ed975f6b02d4754fce45db5 100644
GIT binary patch
delta 107
zcmcb>eS&*}B6rgB9SjVt4h#$o9UFBFnVHR*<2ENS%QAV3FfalIr5N0RG!p~E|2aS!
f1c7WImH@IC7!(*ZfNY2?L<JLA1xOV{HJAhd|4<Go

delta 115
zcmX@XeSv#|B6rdAFANN<4h#$oeH(QQnVH3z9&AovmSqZ-U|<9a`T!vl5Q4$~IY2QG
fWMYs3%c?NwF)$;^GJsVufmJ}%fz(3u08Ik`xF`=W

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.21,23.otf
index f49296ce1c447d625542400cb0e80d87c41b1066..a785d496776cd04d75fa5b0bd72759fcada34552 100644
GIT binary patch
delta 106
zcmcb?b%ASwB6rgB9SjUCCm0wQIyUNDWMZzIaB>qfE0ebf10zsOiop#?Gchpyp97>p
e5Xc5%2_TDsL4iR7$cD&5R4{>6fK)+LgGm6Q#}FO>

delta 114
zcmcb>b%SeyB6rdAFANMUCm0wQ`ZnrZWMYn-;Jt~Nl_^+)fe|R?1B6UK2nPS>0L4I%
ei9rS|tHPkiz>Flz09L^SRsm55QVY=oGz|a|?hqyb

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.2E,23.otf
index e2834af616e8955b0a73d245aef55441c95fcae5..a80ccfcbc2a2806ddb12a58b16ff46eb4f32c57c 100644
GIT binary patch
delta 43
xcmdnO^MreX0uO^E0}lfO>lFqD27!$_cbHjL+&r*-GY`voMou0EKA<QN008t=3FrU-

delta 123
zcmaFDy@h9j0?$K}7yb+ktXCKq7~(eS++k*Uw($Mq%{(mU86)KwbQl<O5=-(JI2c%f
u@(lm~GcW=v#*)<H5}+861;#84OkkP=NQ;2Qq!^TdY>+HS4Kf6&WB>pW2@^5^

diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.keep-layout.retain-all-codepoint.otf
index f2c35943d17a894e5d266a4166e02863922428ff..aebc39673a8aaf5d911945218a25d64c595aba52 100644
GIT binary patch
delta 107
zcmbOt+ao(ck-O=I6$1kw3j+f~$3~r4Zsr-=**5oZZ)NfpVPFIbN-?+rX(k4S|8sye
hBZDG{4a5>)Sp^0SAR8hJQNaXMp$wD*VTgJl2>?P952OG9

delta 115
zcmeB?ogzCyk$dusY6b>A76t}}2^)1{xtYth)okwJ-pUj#!N3R<^aDaBAOwT|bAV!u
j42nR$3|Ll$!GM7oNtOYuf(fWX8LW;OtcnTD2I>R=1Bno;

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,623,62D,644,627,645,2E.ttf
index f361131df774642d349d71bda833a20406a8b790..7ae9c56bef348154ea23322569f20190463aaa7a 100644
GIT binary patch
delta 58
zcmZqp!_@GHX@VlN>(;j$RlbHW&tAf~Stc|;QCft7g@J)Vib0Nnk%0-wVgS;N41yr`
J=4IQW*Z~v=4d4I(

delta 58
zcmZqp!_@GHX@VlN_ttwGRlbHW_b-v(EEAfaC@sOj!oa{F2ZT&O$ngI?kjKEl2!w*0
Jmu-t;2LLsb58eO(

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,623,62D,644,627,645,2E.ttf
index 57ef1910e79cca37e780abd84643bf259da11e05..3a64b97a67f11b752ec60ede2a5e583dbcd3c4aa 100644
GIT binary patch
delta 56
zcmbP|F(qSyBJ(Yqh>a?HRhfkfIX6F1J<cXA!ob47z#zpS$H2(I1Y|J)X%GamHy_jS
GV+R1KSPNGG

delta 56
zcmbP|F(qSyBJ%?q&y6a3Rhiie)i*y;J<cXA!N9`6z#s>NOhCx+|2>e$z`zKCn~&-E
Gu>%0hBn?#n


From 2df39bcae7e34630361a49c44e9d295233367ce0 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 16 Mar 2021 14:20:49 -0700
Subject: [PATCH 4/5] [subset] don't allocate a set to use as a glyph filter
 for PairPosFormat2.

---
 src/hb-ot-layout-common.hh     | 34 ++++++++++++++++++++++------------
 src/hb-ot-layout-gpos-table.hh |  7 +------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index a0ea8c164..a5d7804c7 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -88,7 +88,6 @@ static inline void ClassDef_serialize (hb_serialize_context_t *c,
 				       Iterator it);
 
 static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
-					  const hb_set_t &glyphset,
 					  const hb_map_t &gid_klass_map,
 					  hb_sorted_vector_t<HBGlyphID> &glyphs,
 					  const hb_set_t &klasses,
@@ -1646,7 +1645,6 @@ Coverage_serialize (hb_serialize_context_t *c,
 { c->start_embed<Coverage> ()->serialize (c, it); }
 
 static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
-					  const hb_set_t &glyphset,
 					  const hb_map_t &gid_klass_map,
 					  hb_sorted_vector_t<HBGlyphID> &glyphs,
 					  const hb_set_t &klasses,
@@ -1662,7 +1660,7 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
 
   /* any glyph not assigned a class value falls into Class zero (0),
    * if any glyph assigned to class 0, remapping must start with 0->0*/
-  if (!use_class_zero || glyphset.get_population () > gid_klass_map.get_population ())
+  if (!use_class_zero)
     klass_map->set (0, 0);
 
   unsigned idx = klass_map->has (0) ? 1 : 0;
@@ -1734,10 +1732,10 @@ struct ClassDefFormat1
   bool subset (hb_subset_context_t *c,
 	       hb_map_t *klass_map = nullptr /*OUT*/,
                bool use_class_zero = true,
-               const hb_set_t* glyph_filter = nullptr) const
+               const Coverage* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t *glyphset = glyph_filter ? glyph_filter : c->plan->glyphset_gsub ();
+    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
@@ -1746,9 +1744,12 @@ struct ClassDefFormat1
 
     hb_codepoint_t start = startGlyph;
     hb_codepoint_t end   = start + classValue.len;
+
     for (const hb_codepoint_t gid : + hb_range (start, end)
-				    | hb_filter (glyphset))
+                                    | hb_filter (glyphset))
     {
+      if (glyph_filter && !glyph_filter->has(gid)) continue;
+
       unsigned klass = classValue[gid - start];
       if (!klass) continue;
 
@@ -1757,7 +1758,11 @@ struct ClassDefFormat1
       orig_klasses.add (klass);
     }
 
-    ClassDef_remap_and_serialize (c->serializer, *glyphset, gid_org_klass_map,
+    unsigned glyph_count = glyph_filter
+                           ? hb_len (hb_iter (glyphset) | hb_filter (glyph_filter))
+                           : glyphset.get_population ();
+    use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population ();
+    ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map,
 				  glyphs, orig_klasses, use_class_zero, klass_map);
     return_trace ((bool) glyphs);
   }
@@ -1909,10 +1914,10 @@ struct ClassDefFormat2
   bool subset (hb_subset_context_t *c,
 	       hb_map_t *klass_map = nullptr /*OUT*/,
                bool use_class_zero = true,
-               const hb_set_t* glyph_filter = nullptr) const
+               const Coverage* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t *glyphset = glyph_filter != nullptr ? glyph_filter : c->plan->glyphset_gsub ();
+    const hb_set_t &glyphset = *c->plan->glyphset_gsub ();
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
@@ -1928,14 +1933,19 @@ struct ClassDefFormat2
       hb_codepoint_t end   = rangeRecord[i].last + 1;
       for (hb_codepoint_t g = start; g < end; g++)
       {
-	if (!glyphset->has (g)) continue;
+	if (!glyphset.has (g)) continue;
+        if (glyph_filter && !glyph_filter->has (g)) continue;
 	glyphs.push (glyph_map[g]);
 	gid_org_klass_map.set (glyph_map[g], klass);
 	orig_klasses.add (klass);
       }
     }
 
-    ClassDef_remap_and_serialize (c->serializer, *glyphset, gid_org_klass_map,
+    unsigned glyph_count = glyph_filter
+                           ? hb_len (hb_iter (glyphset) | hb_filter (glyph_filter))
+                           : glyphset.get_population ();
+    use_class_zero = use_class_zero && glyph_count <= gid_org_klass_map.get_population ();
+    ClassDef_remap_and_serialize (c->serializer, gid_org_klass_map,
 				  glyphs, orig_klasses, use_class_zero, klass_map);
     return_trace ((bool) glyphs);
   }
@@ -2089,7 +2099,7 @@ struct ClassDef
   bool subset (hb_subset_context_t *c,
 	       hb_map_t *klass_map = nullptr /*OUT*/,
                bool use_class_zero = true,
-               const hb_set_t* glyph_filter = nullptr) const
+               const Coverage* glyph_filter = nullptr) const
   {
     TRACE_SUBSET (this);
     switch (u.format) {
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 1157d16a4..85ff4bc84 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -1437,13 +1437,8 @@ struct PairPosFormat2
     out->valueFormat1 = valueFormat1;
     out->valueFormat2 = valueFormat2;
 
-    hb_set_t coverage_glyphs;
-    + hb_iter (this + coverage)
-    | hb_filter (c->plan->glyphset_gsub())
-    | hb_sink (coverage_glyphs);
-
     hb_map_t klass1_map;
-    out->classDef1.serialize_subset (c, classDef1, this, &klass1_map, true, &coverage_glyphs);
+    out->classDef1.serialize_subset (c, classDef1, this, &klass1_map, true, &(this + coverage));
     out->class1Count = klass1_map.get_population ();
 
     hb_map_t klass2_map;

From 1b79b8cd2daebc99acd9310742755f02162e5ed0 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Tue, 16 Mar 2021 15:23:11 -0700
Subject: [PATCH 5/5] [subset] update gpos tests to reflect updated behaviour.

---
 test/api/fonts/AdobeVFPrototype.WA.gpos.otf | Bin 3948 -> 4148 bytes
 test/api/fonts/Roboto-Regular-gpos-aw.ttf   | Bin 2232 -> 2236 bytes
 test/api/test-subset-gpos.c                 |   5 -----
 3 files changed, 5 deletions(-)

diff --git a/test/api/fonts/AdobeVFPrototype.WA.gpos.otf b/test/api/fonts/AdobeVFPrototype.WA.gpos.otf
index 967ef255431958ae3e60b972531b8cf22a5fe1d2..31c9970fd82dfb51557f046e405649319f00c3e2 100644
GIT binary patch
delta 531
zcmYL_O-LJ26ot>^XPgWYV+evp)QVEI0VTA7f@q>K5s5^SF^Iaz_(v9InraAHl*XkS
zMI3j!uv9_l4~jwD>B5Bz5v&{6;!12+Mchr#B!#}mz3+YJoqHeeJvNq_i!nusp;iEF
za1DgRzUko9H$Z5hupJ2vhMlW*PQZQwARZZwCB9zo-2h@W`8bjo>wkB0e@8wiPYor5
z@uv>yH&E3~o*W^6w{A_7Ka%sYM3--Jt*}o1Lrx`>U{Sefyx#;Qg~EfHR~K8f)=z*V
zKz=imQL`vwg`6Yz%=7%Gw^Jh@koVJb>a541&@YdZ{b>qSNy`s1FF|WMlPgHKm?f9U
z)fu&rg>{r$`HV@_)EAk#{a-h1C|~fE!`b&sIpZ2Wz~wo7{$gvg()NG2!H<Fq7G^Kw
ztzHse)==}nGzt)&WRHGj?|YSkOjkQXl%we9zS2oXkFgCuRTvxS)&pXFJ?odt#dHbf
zFf$ch6WfvkdNIKXILo)2PN0tA`p2f%&5%ugeHy6r0#{2Y997_6P;(lq&0#Z>Vc=+0
X?6XP`1o88Sp&EVH-hFiG*s=cw8PjE?

delta 375
zcmdm@@J6oQKP1GTfuEs)ftjJe+0D%;$uVXP0|Ub!1_qWn?g9S6t4r0^F)*-R0E+GN
z2y+bjrpfV+fq`uTkRR;}<gaC(odo2+0rJcIgY}J~`znBP>?uHgLU4#<$O*Y8Q-J&<
zK>n-5vcw{#Je4{I296CtzDaU!VtoNaJwpdj;0aK`CJm_Il8#m$0|Tc5kiQ}$H8Dkm
zGX$uCbq0`cmH`xC4`Tv4i1P%Huac2lQo(V90caT~$N@aLi4_G5%mF|q=MNykmY0~D
zy5j9+pm|(CE~{5TesRhFiws5#4E#Po0R<+8&2o%$SvVOO7#Z0P27LHFIfct$vH+W<
zaRyKa6N3qZ3s6}I5HbTH5d6Qv;P-zQg9nHWRN?o34ucbj`F|3F&Ex_$Nl_*Sh6bQ%
ZP?8a71`tnP#HPAgncb3k^AxTHtN_fXS+)QG

diff --git a/test/api/fonts/Roboto-Regular-gpos-aw.ttf b/test/api/fonts/Roboto-Regular-gpos-aw.ttf
index 1b34d05515c8f20a2021f241204a1863b4d8c479..8dfa99a1b26034b89fb8fcc23cf88464bd05df1b 100644
GIT binary patch
delta 635
zcmXYtKWx)b5XL`0+jSDsk`^Q&LY38aFiIq#{1Gz>jVcATB7uR0xQ=71*o~E%l4hyY
znE@~p5(9q*BqWwB74i;9OiT=n3`GK|V}&Y(?<IXt@813HzISKe-gG*>0|megjRvz?
zxwV94WB{eis8wBEsq3Hrz9u)wTh;pAo5|#^Ab%rYU8!GOjQ!m?fFYpigm#3FYM$IA
z2hLV(mfjn$$Wq^EM_%~&u=xQ{P1Z;~dvhmZyHo7`lY+b#Y`4$6TQ32+MZr_Q74`~-
zHU&)VF<<aqyLGhwy-)oC`MS?Q?vwtO`7h)JKa6{mzi~wVBkKhn$3`E_Y5U|%X!jy<
zMa?pQNH#a@d!Z{{oHz>@Jh%~cHsfK47I{?)qOKdgY5)65j`%^#Q248}%*Zu0BDSHQ
zr%%BsLYovaw;!D5Oo2HRk9Fg`)Qq<{zA2&y<gm!CRhDWE%sSiM07b9sK14CF;|*4k
zOIE~iC~Z<xopUN3c`CHBhP-pU&p+3!<cE48xop%2mX<0e(}J@We0-7ujOHSri20e9
zm-hR~fhZ5k$}@#o8O~%4O*iNymb#EvpP;4PM>wIPl%!(*nj8aLYFUc&9L3ld^ng2X
Y;o%Vi*yxfvSmTM&Nm9cc{L*X6e~#*I?EnA(

delta 632
zcmYjPL2DC17=1gtn@vKjNkuJE%2F3hNl~e#^enMKh_p2EqL;3lO_sXbEa|FgK`O<g
z2X$|v7wth%yyT$B{(uTSdG;cB(1Ry0DuMWBE9eK`%=hNKdEf9cN$Fi_2MU03E*i{Q
z_0ke5FahH$Ps_EH<%WLn{V9+w5{I?M)r;}*-4n$3h!>U{=jI}BcN$RZ#A{Aqhj=5t
z5GTaGb2~CCFO6sPJ5Stfhn?Wg&$U-<RtA)$V{h(+$l@3UpC~AF{H^xMz4Z#oS>{8p
z74(aSHb%qO<cpqbw}$H<w*lD%3my;h@AVhtX$Z>;qW+O@7!prPKfmkP*v3Bf(mxy6
z{ZL#`bHoX;xnZ9TT=6#lgAcgRgT=7B8I1z8h*Lq>bHnHD-yZ;-4VBA-vi?Yke`Tgi
zNPXq-#Od)Th0pnTsLdAC2WV;65M)$T;{A;ESU59Mlg$~LZm?jee{+(R<m8^`UXAy}
zOng_I8JKFK3__!>#0R3eNJ?NzinSas6w>Rm78oO1MHe@i5pxwTI=BTNHhS@jVb1e{
z;Dp6!grjNAS*9^TBssatozqH_FN&MWmFpAy5MbLWa*{oaL-oHEeEA&ap;edaO`LMJ
WdOoa9&%FuDx1$YMsSDWszxV^Jjc~sJ

diff --git a/test/api/test-subset-gpos.c b/test/api/test-subset-gpos.c
index 5c2fe2ed0..e1b3d0091 100644
--- a/test/api/test-subset-gpos.c
+++ b/test/api/test-subset-gpos.c
@@ -32,7 +32,6 @@
 static void
 test_subset_gpos_lookup_subtable (void)
 {
-#ifdef HB_EXPERIMENTAL_API
   hb_face_t *face_pwa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-.aw.ttf");
   hb_face_t *face_wa = hb_test_open_font_file ("fonts/Roboto-Regular-gpos-aw.ttf");
 
@@ -53,14 +52,11 @@ test_subset_gpos_lookup_subtable (void)
   hb_face_destroy (face_pwa_subset);
   hb_face_destroy (face_pwa);
   hb_face_destroy (face_wa);
-#endif
 }
 
-/* TODO: Once GDEF subsetting is implemented, this test may fail & expected result need update. */
 static void
 test_subset_gpos_pairpos1_vf (void)
 {
-#ifdef HB_EXPERIMENTAL_API
   hb_face_t *face_wav = hb_test_open_font_file ("fonts/AdobeVFPrototype.WAV.gpos.otf");
   hb_face_t *face_wa = hb_test_open_font_file ("fonts/AdobeVFPrototype.WA.gpos.otf");
 
@@ -81,7 +77,6 @@ test_subset_gpos_pairpos1_vf (void)
   hb_face_destroy (face_wav_subset);
   hb_face_destroy (face_wav);
   hb_face_destroy (face_wa);
-#endif
 }
 
 int