From 197cb18b22ce11f32f5f2c68c13f7068fb5cc338 Mon Sep 17 00:00:00 2001
From: Garret Rieger <grieger@google.com>
Date: Thu, 7 Jun 2018 15:32:52 -0700
Subject: [PATCH] [subset] Add test cases for gsub closure in subsetting.

---
 test/api/fonts/Roboto-Regular.gsub.fi.ttf   | Bin 0 -> 2652 bytes
 test/api/fonts/Roboto-Regular.gsub.fil.ttf  | Bin 0 -> 3228 bytes
 test/api/fonts/Roboto-Regular.nogsub.fi.ttf | Bin 0 -> 1856 bytes
 test/api/test-subset-glyf.c                 |  52 ++++++++++++++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 test/api/fonts/Roboto-Regular.gsub.fi.ttf
 create mode 100644 test/api/fonts/Roboto-Regular.gsub.fil.ttf
 create mode 100644 test/api/fonts/Roboto-Regular.nogsub.fi.ttf

diff --git a/test/api/fonts/Roboto-Regular.gsub.fi.ttf b/test/api/fonts/Roboto-Regular.gsub.fi.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..f41953bdad661a7d79322470328de22c2540b9a9
GIT binary patch
literal 2652
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

literal 0
HcmV?d00001

diff --git a/test/api/fonts/Roboto-Regular.gsub.fil.ttf b/test/api/fonts/Roboto-Regular.gsub.fil.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..03e0be1a0908308300f709ce0526daa8e23197e0
GIT binary patch
literal 3228
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

literal 0
HcmV?d00001

diff --git a/test/api/fonts/Roboto-Regular.nogsub.fi.ttf b/test/api/fonts/Roboto-Regular.nogsub.fi.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..6a08aa9ac7ea49e60c835e130e23190ac71ef4fc
GIT binary patch
literal 1856
zcmZuyTWlLe6uq;%UauV|wo@l<vu(0lH?P{R(>P7jU^PbA=_8^Eaf)^$XyV3plFG)W
zaoT_cL_DKa+rSSJttuoy2oVX!{z+0*C?An{{16b8sD$`!#Sb8ggsL{?j_pR}G18uU
z&z(ERXLfhIKmfoF^T0!PFzWBjrC)Uca35iHd?Fpo!X@q(03K_QnmC_RJfE1a0f-C8
zN0Qme^o761mvDX_fZUjj&16A>Z2;yjoVQJ;UP%6Yx7C9AeVpGh6;IDq34#s#1*|!y
z60!LGv){jnzZXQ_J%t79b<>B)=aKK7O6TUJF!3SJA-AP66ETRwMdVChO2_81T!2S?
zj`>rbi=`9Xvh@%2_Y?A-Y-T1`OhX*~l;*SN64?)u_r3-&;qQ^-Kma56jaUbDkSN&e
zw>xVO1BHl2CBK}Plp}hH@JRTE3UMNFJ|utyYH@~l<O!ixkEZ@8-_@z)$X7o?iGyz2
zpstOM0|BS|VBla^cc62-xy8Lltg8#uxt+I{macyq>a+R}j-I)Fn_pVYeD;O&UCZ>D
zbBp&+0SA}R?UZR9pOFpv3SxB)`lO<Rl8v%k4sCG%@x(c(b%R>{dC|1xtmA;{b_V#a
z?#_CbxTl4jT3!9>P^zaVbx7zXO}-;XMuY6u;N9b45$a(COeF?TgLewJy&zUNdk(CR
zbJw<?7>SJ8gMY$K2@3%0zd84_c#{m@y(d4oY3Yz=kXlfnH28}U=e~p>`5kwL8s^j{
zz7v+?_vFnJmX3;kxs@T0ugja{ZFB;rE2aS2Ybr<nJ4iCgifnlW^RzXN4h|lL5F}w*
zgiU~?`3eULkoQ@G&}*Vd6x1*8Sh5HL|Ii}VSbY~FQ)JPKF$@B<VH7bE{9#ls7Lk`?
z@oMqCE%&%19ITfOCY!8WOmDh!aTL4*)H0;u>vLIOA;mZ7>$~$7e(bc560f2}ro)ts
z`zYt7WS{DzyjSU`d~^S>=GGNMF^<O#rC*tf#i`I-ia3!lbiYC&s!bz~Xetfq@>ZJA
z^<Ezpm<+DKZbL_bvlRi1rIP=FkD9y#3gugdw5K#WAC_q-tjnsZMCjU(M%Ti!s_Q-~
zZh1tnFHP?#yES{MxX(wWvO-j&A(?`17)&p!xm7xE7_xyoc*xiO$yW&cyAXP`fOjCW
zLgt513WHmfS;4KkRdlF_ebnL|h-wkEsG>!ym$pTGw8~4{G1$EMR<fWNQEfGZ&v0Tz
zf`t)n725baSzV@XG^;GEIPktzYHXL)UK(0hQD9Wdw?kN7g?9c<80$6<1rHR6gY%Gr
zlOQfTdpnwC2S^@RCdVGzuevZ@=CoryZKaGKexj?np4EiYPX;|ZS!U|??%8Q)nfUy(
z{hcz)%<o)yrq|6f>E+3x!woF6j6}LyN-Ea#;{)BhS*_}|_{nmg?N-5<2(ntW%VD#K
zEUO82w(fGW%pU4$-(6bk7<#<y3JSGVX52vexfS{v$V_33!7B{>4J20>WRPL7$l!AZ
zMFvd`WR|U%Wh-XcirIp_k*#I$D}$y+>>FdS$lzNBMFxG1*qmYDSFkUGfQJG0!8QB}
z888Pw;6L_B7=^cB9G-?Q{5ITx0$hf5>~d|6gNwTg3a>(y&<if%5;*W2yTlz(M?MCp
zxCS-iEj*v)!9gQC!GZ<PB|DMjoWp-J8w^7R&ft~9YZwwR3A2!b7@Whd(kPx~-;Vzo
M?Bq+p;mNoE4Pxx4n*aa+

literal 0
HcmV?d00001

diff --git a/test/api/test-subset-glyf.c b/test/api/test-subset-glyf.c
index acc6143e5..d6f6ddea0 100644
--- a/test/api/test-subset-glyf.c
+++ b/test/api/test-subset-glyf.c
@@ -100,6 +100,56 @@ test_subset_glyf_with_components (void)
   hb_face_destroy (face_components);
 }
 
+static void
+test_subset_glyf_with_gsub (void)
+{
+  hb_face_t *face_fil = hb_subset_test_open_font ("fonts/Roboto-Regular.gsub.fil.ttf");
+  hb_face_t *face_fi = hb_subset_test_open_font ("fonts/Roboto-Regular.gsub.fi.ttf");
+
+  hb_set_t *codepoints = hb_set_create();
+  hb_set_add (codepoints, 102); // f
+  hb_set_add (codepoints, 105); // i
+
+  hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
+  hb_set_destroy (codepoints);
+  *hb_subset_input_drop_ot_layout (input) = false;
+
+  hb_face_t *face_subset = hb_subset_test_create_subset (face_fil, input);
+
+  hb_subset_test_check (face_fi, face_subset, HB_TAG ('g','l','y','f'));
+  hb_subset_test_check (face_fi, face_subset, HB_TAG ('l','o','c', 'a'));
+  check_maxp_num_glyphs(face_subset, 5, true);
+
+  hb_face_destroy (face_subset);
+  hb_face_destroy (face_fi);
+  hb_face_destroy (face_fil);
+}
+
+static void
+test_subset_glyf_without_gsub (void)
+{
+  hb_face_t *face_fil = hb_subset_test_open_font ("fonts/Roboto-Regular.gsub.fil.ttf");
+  hb_face_t *face_fi = hb_subset_test_open_font ("fonts/Roboto-Regular.nogsub.fi.ttf");
+
+  hb_set_t *codepoints = hb_set_create();
+  hb_set_add (codepoints, 102); // f
+  hb_set_add (codepoints, 105); // i
+
+  hb_subset_input_t *input = hb_subset_test_create_input (codepoints);
+  hb_set_destroy (codepoints);
+  *hb_subset_input_drop_ot_layout (input) = true;
+
+  hb_face_t *face_subset = hb_subset_test_create_subset (face_fil, input);
+
+  hb_subset_test_check (face_fi, face_subset, HB_TAG ('g','l','y','f'));
+  hb_subset_test_check (face_fi, face_subset, HB_TAG ('l','o','c', 'a'));
+  check_maxp_num_glyphs(face_subset, 3, true);
+
+  hb_face_destroy (face_subset);
+  hb_face_destroy (face_fi);
+  hb_face_destroy (face_fil);
+}
+
 static void
 test_subset_glyf_noop (void)
 {
@@ -213,6 +263,8 @@ main (int argc, char **argv)
   hb_test_add (test_subset_glyf_strip_hints_composite);
   hb_test_add (test_subset_glyf_strip_hints_invalid);
   hb_test_add (test_subset_glyf_with_components);
+  hb_test_add (test_subset_glyf_with_gsub);
+  hb_test_add (test_subset_glyf_without_gsub);
 
   return hb_test_run();
 }