From fcd7f33bbb12d66b3a50caa448cb91ef7c0daa9e Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Mon, 10 Feb 2020 10:36:50 -0800
Subject: [PATCH] [subset] GDEF glyphClassDef subsetting support glyphClassDef
 uses the same ClassDef format. However, glyphClassDef table uses predefined
 class values so we do not remap class values.

---
 src/hb-ot-layout-common.hh                    |  42 ++++++++++--------
 ...1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf | Bin 0 -> 2148 bytes
 .../Mplus1p-Regular.keep-gdef.25771.ttf       | Bin 0 -> 1860 bytes
 ...eep-gdef.3042,3044,3046,3048,304A,304B.ttf | Bin 0 -> 2572 bytes
 ...eep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf | Bin 0 -> 2816 bytes
 .../Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf | Bin 0 -> 2116 bytes
 ...eep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf | Bin 0 -> 3112 bytes
 .../Mplus1p-Regular.keep-gdef.660E.ttf        | Bin 0 -> 1852 bytes
 test/subset/data/profiles/keep-gdef.txt       |   1 +
 test/subset/data/tests/japanese.tests         |   1 +
 10 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf
 create mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf
 create mode 100644 test/subset/data/profiles/keep-gdef.txt

diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index 8fc9e07b3..3660c2043 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -78,8 +78,8 @@ static inline void ClassDef_serialize (hb_serialize_context_t *c,
 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,
-                                          hb_sorted_vector_t<unsigned> klasses,
+                                          hb_sorted_vector_t<HBGlyphID> &glyphs,
+                                          const hb_set_t &klasses,
                                           hb_map_t *klass_map /*INOUT*/);
 
 struct hb_subset_layout_context_t :
@@ -1573,16 +1573,22 @@ Coverage_serialize (hb_serialize_context_t *c,
 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,
-                                          hb_sorted_vector_t<unsigned> klasses,
+                                          hb_sorted_vector_t<HBGlyphID> &glyphs,
+                                          const hb_set_t &klasses,
                                           hb_map_t *klass_map /*INOUT*/)
 {
-  bool has_no_match = glyphset.get_population () > gid_klass_map.get_population ();
+  if (!klass_map)
+  {
+    ClassDef_serialize (c, hb_zip (glyphs.iter (), + glyphs.iter ()
+						   | hb_map (gid_klass_map)));
+    return;
+  }
 
-  hb_map_t m;
-  if (!klass_map) klass_map = &m;
+  /* 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 ())
+    klass_map->set (0, 0);
 
-  if (has_no_match) klass_map->set (0, 0);
   unsigned idx = klass_map->has (0) ? 1 : 0;
   for (const unsigned k: klasses.iter ())
   {
@@ -1593,10 +1599,9 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
 
   auto it =
   + glyphs.iter ()
-  | hb_map_retains_sorting ([&] (const HBGlyphID& gid) -> hb_pair_t<hb_codepoint_t, HBUINT16>
+  | hb_map_retains_sorting ([&] (const HBGlyphID& gid) -> hb_pair_t<hb_codepoint_t, unsigned>
                             {
-                              HBUINT16 new_klass;
-                              new_klass = klass_map->get (gid_klass_map[gid]);
+                              unsigned new_klass = klass_map->get (gid_klass_map[gid]);
                               return hb_pair ((hb_codepoint_t)gid, new_klass);
                             })
   ;
@@ -1644,11 +1649,11 @@ struct ClassDefFormat1
                hb_map_t *klass_map = nullptr /*OUT*/) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset ();
+    const hb_set_t &glyphset = klass_map ? *c->plan->glyphset () : *c->plan->_glyphset_gsub;
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
-    hb_sorted_vector_t<unsigned> orig_klasses;
+    hb_set_t orig_klasses;
     hb_map_t gid_org_klass_map;
 
     hb_codepoint_t start = startGlyph;
@@ -1661,7 +1666,7 @@ struct ClassDefFormat1
 
       glyphs.push (glyph_map[gid]);
       gid_org_klass_map.set (glyph_map[gid], klass);
-      orig_klasses.push (klass);
+      orig_klasses.add (klass);
     }
 
     ClassDef_remap_and_serialize (c->serializer, glyphset, gid_org_klass_map,
@@ -1813,11 +1818,11 @@ struct ClassDefFormat2
                hb_map_t *klass_map = nullptr /*OUT*/) const
   {
     TRACE_SUBSET (this);
-    const hb_set_t &glyphset = *c->plan->glyphset ();
+    const hb_set_t &glyphset = klass_map ? *c->plan->glyphset () : *c->plan->_glyphset_gsub;
     const hb_map_t &glyph_map = *c->plan->glyph_map;
 
     hb_sorted_vector_t<HBGlyphID> glyphs;
-    hb_sorted_vector_t<unsigned> orig_klasses;
+    hb_set_t orig_klasses;
     hb_map_t gid_org_klass_map;
 
     unsigned count = rangeRecord.len;
@@ -1832,7 +1837,7 @@ struct ClassDefFormat2
 	if (!glyphset.has (g)) continue;
 	glyphs.push (glyph_map[g]);
         gid_org_klass_map.set (glyph_map[g], klass);
-        orig_klasses.push (klass);
+        orig_klasses.add (klass);
       }
     }
 
@@ -1957,6 +1962,7 @@ struct ClassDef
       {
         hb_codepoint_t cur_gid = gid_klass_pair.first;
         unsigned cur_klass = gid_klass_pair.second;
+        if (cur_gid == glyph_min || !cur_klass) continue;
         if (cur_gid != prev_gid + 1 ||
             cur_klass != prev_klass)
           num_ranges++;
@@ -1965,7 +1971,7 @@ struct ClassDef
         prev_klass = cur_klass;
       }
 
-      if (1 + (glyph_max - glyph_min + 1) < num_ranges * 3)
+      if (1 + (glyph_max - glyph_min + 1) <= num_ranges * 3)
 	format = 1;
     }
     u.format = format;
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8b6ddd8f687220ff5fe7d9b4a49c1d4962c22fad
GIT binary patch
literal 2148
zcmaJ?TWnNC82)F@-bxGIw%fI`AanLW5%*HM+ZHcSw-*=Mf-b8i=hRAF%F;qwyP>54
z1%rZ$M<K-cphlyK;^hG|MUBRoh{mW7YP=wrs?iu9cu}MA8fDjS&em&;XEQVZZNBgS
z=gj$+7!lQAa*=;+_Z4ZXAvck45v;+hu5L=KI(GaQBCQ+xrs45ifx<(Fpg#z`Fg!ga
zJooZ%i9C-%U$Ct(GG6^`(-Q!zBI5ax++?9tA`N%}_<bW|d$tWfzVI*+13tTZG@sk*
zKXmkb#GZn`Z4`!z`{-5R3+PKn$ES8z?xk;_1CIh@6T>+=#)61{6MEHnZg+vD*g@z|
zLKipW#`D1=&4~9r3;a}JVsff<J0*y`-z$G%XTBi6iy#-z6!iEs_`I+9pGRsb=u4-;
z=lVjkp|?P<B2EUd@8PrLrAneCOEP1*?yb``!(f#IY+iqF@vWXA<~zXo?77AdKV<c6
zAL{Kd{mA3|OY%_z>BuDPtxqOeTN>*EdU$zFTT;{qJl^_X(A&~z7&XCUf_YkEU9$tP
z7r)qiooO*|CT$K~x$8hz^QG_dM=QSF-@dxo^ogIp<DY3atNHvb-M#7JnF{20A(%`s
zEu=>9tZD;^5%zeOx3wh`^?r{LZftFV7}OGTuKGZb{mNb4>z9o+S0!$ZoqFPt{J{rr
zSu^y8HF0hG;7*I(#l%(pJtCA2EjwHM?&m$5Z@zD3@%Fv>i?fqMU7Ju{9Gn}$sZkv*
zCt6kG@t=np+O?LrW`w=9;kee)t|cze0t@)ZHy>|UyriuozGO+fqixCJhRxY^y{)?5
z+Ph8(;c#p3rF>hexG>|cTG74t@x9$Es@&(&wTX>)p15;kqV^8~#o>*(={*Y4e&@|F
zRF9hga~zZM5``#3Hofj>toor{AHC=ss$TsAk7#F=`-8+K>R!{C8tviI;o?*7n_Nk#
zK4nu68zY@RM+V<S{ron%kneY}$(1agqyhK6rNh6Cx^J4}DsNG<o0xVNJF31LZu6I5
zxx2iw&#9SlpNChvIp-SZUicWtq=tGnM1-Ieb(BilU}=g5TuGL?zLvfG*-vFZ&KQ>;
zV-aRmqgv--U5)QmV0GcA?49_|Na2)D&gG}R7$S9#)uS*vFgh`CT4(B=q3rC;N6rA2
zq^P92K6z2bl)clIB;)c1>4}(YEXTIb5~n1qi#Nn1i;7uU6^Th6?aP{17?vKBT6BAZ
zkg1HR%aj$9uBh6o8~Tmrr=hp45aP^pp|7lvp-Xqfl<8^9aab1c+|l`i12O4|&V<<^
zu!}>3gCR+P@kVEsI;Pa0CSSC+MqJVqlNC|1Pm#O^d?B@EJ%*63#$HJo)6UyDp@fS=
zx^9JRN6VHqML4gVoj>H)K~fnN?>psGMMabJMg~nG)*9*D4q=L|TgnhBZoXm$wXnrn
zJDoFZVH*yeAt`Ih6e3ZdqLrz<Qm|)%!?fmfgRY0fX&c9YO+Co1e=axVhp_6XAx_Vc
z8^Y|nI;2ZxnKlaQF>FKFJ+_fknW%Eqtn%@z*HDYsP@@V^LhZi_K%z$4$nCiP@0F;n
zbx{;y-=U7JcdKE0rO248Lnq-0M4zD)OLca#z8Cy7OwO!=`;ob@v!<~H*&Cf9EX?S{
z$)~dB3Eal6;m#9GFf39G%k%S#oJ@gOAC<7;TrkCO0bgLH+ax<oebSdPXBazT&7{>`
zk$zmXKo-J&YcXEzplQiKgs8L>9mmIK`PcY9_W%G5od(q1byYxKk5QHx`Jt6%P77#o
zPS&WKcFf86pZhb$jlTKxoZUkg(3{jn6I7r*w3D{e2#wMd>PpZ`YNj?w*T9m;x`85?
zGl-f1ZXSoE;yP#-)=}7Y(j+>^1|W^WHVI!d<SZgbppQ`w5zUBL3DjoTE~B;BH34Z1
zF=<FQ0BI8Tzc3U+>|Yq05UsejJ3AE1ADI8YPjv%4r331}@joAie!`tjQtl(FWvMRf
kbQ|p~e}HbK-Oi8sNxS3R{WPGREv+cEx}E_Z`v)fb9pewzV*mgE

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cce2d366060de9044fd82a1956a5592949583807
GIT binary patch
literal 1860
zcmaJ?TWl0n82-=9-hh_f?PXh>s%My%0z2E%E^Q%DS=zF-Erd;>Wu~sN+p@Hfmac7W
zxCBGug=V;jh6gnoeDKDDa!O6)!32yZ`hX8!f(g;+BQI(+USa}WzcXFH5aXH5Isf;c
z@4wE;8Dc~f#^j+;XUDcA1xX?Dd!Q}bxvRdhWoZ6yB4rx5e|S8Tqtc5Nz}J9R56?_<
z-#O)1BJU~S<@<6Y<G~N=-@*Rxc(Ws!sa!r!Dv|FN_5&khhxa}G_?aU_tP1$rXg0Gq
zG<$XhxFO)?Q7D$YOjm$Yz}2JU(}%pfX*2Mn(td1WI79m&krKe<8_yidu~zmh{M`iR
z2Q%Z@$eD&;kk4z-C2|u})A{GA5!CPGer__G6Td~vu%8C5n?XGP$Dt2VF9)ukK|GJH
zyb4?i>_aEC`~~$h)u1ZsAS#VF`TVubEfqe0dA!_+RQOlbhK;bRGiq8Q70oSrlV0xg
zM<Nw*ET9_UGM}-swl)%PY;Fo0P5P?(mtuSTm)<LBw_ltch;L|G(_OdSoHQLaU)R6k
zvE;%F>{{Q!;&q;jjj2tW)}Md4ed~55vA(AG7Sl$R>T|xpmSD8CB=pACcZX`GQwt63
z%@bpfy!H0v`c`x2?zXmx%(As=$Hd^8<lw?5{j0ql-e8oqcJz__&I)}=5jsvqkQm+w
zx`aMplDp*gR!S`R`p%Koq9=lz|4^c;>@9uWxUovE--gxm`O^y*yhlB8K=~cq!Ny1j
zQ<I)N@rA22;60Z=eQVTvwBY*=QD(u^lk6;cAv(%O*f_PgvLC5|DFL6d%&RDhswjSG
zwDg`O?TB(ti9Cjy&QH^TC(aUsCG5%%e-%g!r%f6Z;gQ4587r#Y^Q8Mi7Gw%4?GbBJ
zmgt_b1sPi^g)eHg+OF=H&A$<>w5~EHn8|O5qG(JgW>2rR&9L>DP|f|7TqIJKE)sT3
zcuZ-k8~PFJd+iHb1JAmx{bXx~F1%4oBxh`Q!?xkiYZj*mV!~(6tz@%^&S%qUO%UAp
z&ADn<mAI=4m?dGpu|6i2nEaRw@+tgtq1JR6TzFP>3rbl|*2!=wY|wPw)*Ki0E+QFl
z>0)*vEu<sJGLwJhmQ!T%df|_zEzUcQWaa?3_}-yK7m`;jBO^3-c&C%h7!G#~H=H4;
z*AfXZQJ)Me5?Kjgv)ql;dc9KDHGbVe8(`Fh-1-W+AwST9ropclf*aiG*`?`%*_MNX
zx(vtQPM2e3WG1p4Im>)P@-vj+GlXRUQYg8v03>Q8jm&|;e^(++OHCBvoRDqn-fK91
z!Bf^|?J9Q4%y~+%L|Yr{xg4Tla%V~IL+0G+wTvNTZ?tJxn9+vLCwi?*#HoF_?Gob*
zi{QgzMYhV#6dub>0WJE1DTYILndP4o>@@X=K+2k9?2J8^lxIbRaL~$nAsn|K#D`5=
zwkV4d<*W05Dgot&@-ykmVR?MXPXjp7%(DdYcD#!+qY%)dtk7~w7i1N;)PaJG`}{7)
zOApZd1-*|RqR*+FCMZXTX_EHS2#wM->T0BQ)IiOUc0-fJx`U#aQ(#TNZx&6Gysh*U
z)=}stX$rT;4tN@aZVG!1kbA)#0Uo0a7!6>ogVzS=Hc=<6CLoQ0lZ12-o~EF`=R<mk
z-RGkpY#D36YayfD@%jID`18n-e@6ZT{&O(=pX6OAZ;Ztu??OE4P5cKoLd8O)p1A!A
T4X8KsYw}H=d8sRK3l{$XHawD<

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..beb4e5233239abeb86fdd1b25c85ea7eb5111532
GIT binary patch
literal 2572
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

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..178989adb79b0a39f6024f9c4cf60b98fac7c117
GIT binary patch
literal 2816
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
Uz$WftY-P-wa1D>JvtKmwPuymc-2eap

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..5fa32f37d243cfb47498e92a2afdc07e419a08b9
GIT binary patch
literal 2116
zcmaJ?TWnNC82)GW)<U7%cDpTZHD`NDx$JHWyR=X)VJ&pqvJlI1JKHqSWxH$(E#0)W
za#f5M;7GB-K7fhfgNe}xGk^&^n23rACi<WvB&gBEmp&*&<?<lx@td>DHOAS@%zyp9
zf9A~05+kA#3|4Zsu55`=3E7AocVTrux2`_8@ZyIlA`4X7m>fuC$gs_Tu0fwjj*cky
z3H~RM{Z;7Gw`I};#UIzd5C88(Je5uiXADCoJ8r^XknZ2T?OerJFA=LkZ|hAZdYp&G
zfyc+;Z|sGk@Hl-A{U_)(y#ph=3UAWi&@VxE^$#W!^abP4C124%VpoQR8D!oAUD=r!
zNV$*BzkzxtfFI5b4v!eGQxN=@r9U&2%80*wF8J3&uNwuQ<1^<ul%_zh83mtxpEU*@
zF;qmHg2rw38!x3Qngzt5yS&_0q1Mh)?RK@gwqZeIDAcf^R;_l-YP7iAp<rV}gIaB8
zg#(+5BL$p$wuRd^9zW91)V_J`w2gBX)wiS?`i6OFXZp+5mRSw+8rQaLO50X1sasN?
z-5&@g+ZMGFquJp63Y_I&thSd++=UhQ`GOUWT2`-ZO|OfDUD4RcxV|SAb**4O4D@sl
zRWDKB+WXR*>M|8uV&eP*oHBZfXrcRY7<akLG1FU%+U>)<r(?}(*ZS^^{_<e|3p~3A
zn;L72ZkpV%b#~L-WBXnlKYU=CYw@PdTTopGpl$p*c8AJJLNh})rp{E$)shpO*|%h`
zvbrtVTfCiL&o2M*PWHyFTL?uK;Z%J~ZaQG@DnoT{(_9Ci^b#$m&2*UFGc{KH&etc8
zS+^7~y~TZ&N$LJR*n~4fbhX5C${5RjVB2dAK`oFr*;qe$c?|{m6q?OvqX$u`Jl3J?
z1?sd-7-M&PZF}=vxfD6th*{oX<MPaNoqqz$k=)FFrTL5(*!ff&=iI`%1HN3PG7oKy
zPf;jL3EE-lGDfJ=8e-w@QugUDcXEF7(#VTb1xaSgc?#zBxND0rPeJt@zXT;IMLTd)
z=%H-9Yn(Dp8Ydp(#Ga#t%~9T18K3JCKbh~iAHd6X$-g7tt%Cf5%A#U!hbC5y#s#U%
zD}~*sEsLAB{c+{8U}bfc0m1yrHBsaX2=0%@v=%k)4G4?BuTl}=4$UjV@qn=UWvW;8
z?$Lhsd=vK|PP^y%BkobX!sgRNWHfF%;&I^F{L{KR1H$e<UCj=GT{+a%<q-rJhyQeq
zX$n6u75Ga_l&1QCDD*4)CCNqLE5b6fT~&m&c9ozGO;70wMGA{NUT@r^n_4WVNx~_)
z>YN^@7bH{t%6H~+iu_8waQM13MQK$diS3G}^lZ&R$hc{e8PtldwCa(Bsw=u`(y4-C
zng}Bj>yxx1oRSK1rkhO5u2g!x9_5OTZ9q~xYTJ;n4fP?c*sm&A^5m+bMb~+}g2go*
z3u;$&RngmZH6bgJ%aNn3$0<KUDLzAqT!0ixpI872RU>L*d-tO&k*Q^VEJ8mhw{2CA
zsyl?zp)K`XfXC%OOJNpnZf4Q*P8=F@l))QNxuVB3bt|e@n?0DA+KinK$Fwt~(28X9
z8Ky8yLP?4lsVcKlAeQ?Dtk@R}0UWmT%y><(F^Y<U4(&8!N8_g>@~j9a4w@?l;XwRp
zeAq56E?hn$qsF++3-~oW6<)p@0C=#eQ{EbDA>`HQIhm0YT2AIPox1X}g;vt`yo~>`
z2QfChd>`fQc6x>`(Fz)*4DF^N>Z3IE(g@ZSq<J)-8X>KRC53qn`7m}MY7n?7Y?6$7
zmY&Dl3)>J4Qyro*)DPP*eDfj45SfPFk6SqeOC4|<F{fz>wIXW}Qa@rMkahxT81{!4
z5+U#e#zsU-u0AtEvfRh~|2%o?(TrE*f8T#LhS!FhZ%gh?k^dL+CALbNWs<+mR>>dg
aWKOaiymx{+EtAF^qrrL>c!+tVv3~(lRmg7u

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..17d4d07ac8077c7ee94f589e96cc8083dc4f2b1c
GIT binary patch
literal 3112
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
a(E$7W(k!&F52LH24#h>>L-#)Z$bSG9SJtio

literal 0
HcmV?d00001

diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b715f26917cdfd681ba3bc8a661c3cab730877eb
GIT binary patch
literal 1852
zcmaJ>TWl0n82-=9URo&aw%yj^6my25HoCKvZPP}i#HGMCZ6P*Wz?sb^vTV04&6cjT
zHXtFAc%d1k^3Vs+5TA@16Fdcz*2DxfCi-F`O2Cj1edNJQ#9JTOj^CMGsv*X+nREW{
z|G)os&e=nZh-xwUDAc=acY<n2Aqw1sHvIHZTl<CQnktBtZr}siiA;f-+wTI;16$dd
zX&#tYekJn13|u`@7@es3sO??Yf5ev?%}f<smsG_29rlXR{PB@tYH1;2&A{_xxy*2A
z_UwA#?|{3;pr|}YSK!+OylHG=`j~$ood6C=|NLY&L;aA5eT^wFkvUdi+Zl2*0nCqN
zCUT8)v0qRR>SOW3<kYnLDz$@pUD^vra|LlX5{7*r@a7rh3w|0}Bno=@W{}UfO?eYo
z<_qALaxbcLY9;xp5<62*4^b468^Xbk&eo1jgEbhndM#@xqm8YtjUDY>ot=6h*xJ?A
z30pXz^!e^BFE6j82iTq!_hSs@4W3u6^?dD0al`DBsa`gxvD>!My|m-K;?217R`DHH
zf9+b&XGPV&%U=`uaPh_1{x3dY*`oPOE6MXx=o&TBDXN0R@HL_)^n*!S$=f3-v6>5u
z%R9QCt?B+liKus^>D%_La_{M8t@^fmX61eV310^w&bTyKo^&u%GLo-j<tnB8^X{2@
zWBwE6*!PLD3Z}ls&SGy!ag<MBc)hf;A1KC@ih#1#uPBPDC_(A8nga6P2<H?ZsUE3T
z)9y5-d>t%)u#R2%{x8YIz@72FX3Vk^xvs(5jeE+m`tXB(q#F0jo6rANuCEGK$uA9$
zBN>3WB&MMH0rB{tCHiM<LB>-}A`r2*+n(;E&94hqzqu(Yn8|O6sz_8Q=0MWgZP<EL
zsOI4&F5-ihF5-4n_)O`l8~O{@ZS5;t1J5dIKiQh03xC8Ci5c57*f!$%&2{NiR0Pb0
zjcgX#`D{9^2|}2lxv<Go#aC4oW?e1c+7=a+CO;{Ye2(~Bs4aa47rsaP1r1tG&dG2o
zJfZ2jtvMb_mXJ)irc_->3+YI**5u!K?Nph(O#~xpi}PM1ks0R}A3jtHA$jX$W~Am0
z?{yLx!{LtMr85L2EfEJ3{mHZ<o|6DR)n2CUH=1-^<2M{^1DyI$+x~KGs1LLn)8IGC
z$qjA|3~9Pxw&kFqKEpA%)8`l&S&3{%&a$46Jcc?PL#=E;3Uv=OfI^Lgkr_Yu?@pv^
zy@@8A({kJThYcqv_@LFTU4<oVUZyyU_w=xVr4VJwn<aTaD(6npG7h17qesKSj2`TK
zJZW9Rt=pOHxx_fbB6wD;&oz6MB4UFnpvAsm!t+2&%zZ_$Gc+J72CW6g=In)pyelGv
zixy5oIAw3Z!KN)+gd;@mCihRJLb;{<OuBO1ySPF8199_xl|Xy&m1IUCppvXmHKoh4
zO1o&hEaM$t<@o7gx>(i+=n?vocG4sj=r|pv!!$}`G>yL6X$!@u3(`Jla#;6L1oI$R
zlZczcCQ057dLHW-bVq3lugzXW%0o8=TMTj%%u(PxWx$Amu?10M&~2k$cuhjegOh-C
z1d*no|0jlw5PcxV0kCDR!=8uCazEz(`^nb>!+lA<{r@=_-VOP765i0#kZ&h`>K(lQ
bLr}30si%wQDW%?VA9Fi>m!+=EEqnY85Db!>

literal 0
HcmV?d00001

diff --git a/test/subset/data/profiles/keep-gdef.txt b/test/subset/data/profiles/keep-gdef.txt
new file mode 100644
index 000000000..4252d6734
--- /dev/null
+++ b/test/subset/data/profiles/keep-gdef.txt
@@ -0,0 +1 @@
+--drop-tables-=GDEF
diff --git a/test/subset/data/tests/japanese.tests b/test/subset/data/tests/japanese.tests
index d923491be..28264ade1 100644
--- a/test/subset/data/tests/japanese.tests
+++ b/test/subset/data/tests/japanese.tests
@@ -4,6 +4,7 @@ Mplus1p-Regular.ttf
 PROFILES:
 default.txt
 drop-hints.txt
+keep-gdef.txt
 
 SUBSETS:
 明