From 56ca435787c1686fcfe01bf4db822bb91d9ba769 Mon Sep 17 00:00:00 2001
From: Qunxin Liu <qxliu@google.com>
Date: Thu, 28 Jan 2021 15:21:26 -0800
Subject: [PATCH] [subset] fix for collect_features and
 remove_redundant_lamngsys

previously remove_redundant_sys () is missing in harfbuzz, after
redundant langsys removal, some features are removed as well in
prune_features() in fonttools. This change is trying to get the same
result between harfbuzz and fonttools.
---
 src/hb-ot-layout-common.hh                    | 182 ++++++++++++++++--
 src/hb-ot-layout-gpos-table.hh                |   2 +-
 src/hb-ot-layout-gsub-table.hh                |   2 +-
 src/hb-ot-layout-gsubgpos.hh                  |  75 +++++++-
 src/hb-subset-plan.cc                         |  43 ++++-
 src/hb-subset-plan.hh                         |   6 +-
 ...in-gids.627,644,623,62D,644,627,645,2E.ttf | Bin 48640 -> 48596 bytes
 ...eep-layout-retain-gids.627,644,62D,628.ttf | Bin 42884 -> 42836 bytes
 ...egular.keep-layout-retain-gids.627,644.ttf | Bin 36940 -> 36892 bytes
 ...retain-gids.633,645,627,621,20,644,627.ttf | Bin 46724 -> 46680 bytes
 ...ar.keep-layout-retain-gids.63A,64A,631.ttf | Bin 42896 -> 42896 bytes
 ...-layout.627,644,623,62D,644,627,645,2E.ttf | Bin 13332 -> 13288 bytes
 ...ri-Regular.keep-layout.627,644,62D,628.ttf | Bin 10232 -> 10188 bytes
 .../Amiri-Regular.keep-layout.627,644.ttf     | Bin 4412 -> 4364 bytes
 ...keep-layout.633,645,627,621,20,644,627.ttf | Bin 10372 -> 10324 bytes
 .../Amiri-Regular.keep-layout.63A,64A,631.ttf | Bin 7824 -> 7824 bytes
 test/subset/data/fonts/Amiri-Regular.ttf      | Bin 562684 -> 562980 bytes
 17 files changed, 284 insertions(+), 26 deletions(-)

diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index ec47e9ac5..5b758a875 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -94,6 +94,60 @@ static void ClassDef_remap_and_serialize (hb_serialize_context_t *c,
                                           bool use_class_zero,
 					  hb_map_t *klass_map /*INOUT*/);
 
+
+struct hb_prune_langsys_context_t
+{
+  hb_prune_langsys_context_t (const void         *table_,
+                              hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *script_langsys_map_,
+                              const hb_map_t     *duplicate_feature_map_,
+                              hb_set_t           *new_collected_feature_indexes_)
+      :table (table_),
+      script_langsys_map (script_langsys_map_),
+      duplicate_feature_map (duplicate_feature_map_),
+      new_feature_indexes (new_collected_feature_indexes_),
+      script_count (0),langsys_count (0) {}
+
+  bool visitedScript (const void *s)
+  {
+    if (script_count++ > HB_MAX_SCRIPTS)
+      return true;
+
+    return visited (s, visited_script);
+  }
+
+  bool visitedLangsys (const void *l)
+  {
+    if (langsys_count++ > HB_MAX_LANGSYS)
+      return true;
+
+    return visited (l, visited_langsys);
+  }
+
+  private:
+  template <typename T>
+  bool visited (const T *p, hb_set_t &visited_set)
+  {
+    hb_codepoint_t delta = (hb_codepoint_t) ((uintptr_t) p - (uintptr_t) table);
+     if (visited_set.has (delta))
+      return true;
+
+    visited_set.add (delta);
+    return false;
+  }
+
+  public:
+  const void *table;
+  hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *script_langsys_map;
+  const hb_map_t     *duplicate_feature_map;
+  hb_set_t           *new_feature_indexes;
+
+  private:
+  hb_set_t visited_script;
+  hb_set_t visited_langsys;
+  unsigned script_count;
+  unsigned langsys_count;
+};
+
 struct hb_subset_layout_context_t :
   hb_dispatch_context_t<hb_subset_layout_context_t, hb_empty_t, HB_DEBUG_SUBSET>
 {
@@ -125,16 +179,21 @@ struct hb_subset_layout_context_t :
   hb_subset_context_t *subset_context;
   const hb_tag_t table_tag;
   const hb_map_t *lookup_index_map;
+  const hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *script_langsys_map;
   const hb_map_t *feature_index_map;
+  unsigned cur_script_index;
 
   hb_subset_layout_context_t (hb_subset_context_t *c_,
 			      hb_tag_t tag_,
 			      hb_map_t *lookup_map_,
-			      hb_map_t *feature_map_) :
+			      hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *script_langsys_map_,
+			      hb_map_t *feature_index_map_) :
 				subset_context (c_),
 				table_tag (tag_),
 				lookup_index_map (lookup_map_),
-				feature_index_map (feature_map_),
+				script_langsys_map (script_langsys_map_),
+				feature_index_map (feature_index_map_),
+				cur_script_index (0xFFFFu),
 				script_count (0),
 				langsys_count (0),
 				feature_index_count (0),
@@ -407,6 +466,30 @@ struct RecordListOfFeature : RecordListOf<Feature>
   }
 };
 
+struct Script;
+struct RecordListOfScript : RecordListOf<Script>
+{
+  bool subset (hb_subset_context_t *c,
+               hb_subset_layout_context_t *l) const
+  {
+    TRACE_SUBSET (this);
+    auto *out = c->serializer->start_embed (*this);
+    if (unlikely (!out || !c->serializer->extend_min (out))) return_trace (false);
+
+    unsigned count = this->len;
+    for (auto _ : + hb_zip (*this, hb_range (count)))
+    {
+      auto snap = c->serializer->snapshot ();
+      l->cur_script_index = _.second;
+      bool ret = _.first.subset (l, this);
+      if (!ret) c->serializer->revert (snap);
+      else out->len++;
+    }
+    
+    return_trace (true);
+  }
+};
+
 struct RangeRecord
 {
   int cmp (hb_codepoint_t g) const
@@ -506,18 +589,46 @@ struct LangSys
     return_trace (c->embed (*this));
   }
 
-  bool operator == (const LangSys& o) const
+  bool compare (const LangSys& o, const hb_map_t *feature_index_map) const
   {
-    if (featureIndex.len != o.featureIndex.len ||
-	reqFeatureIndex != o.reqFeatureIndex)
+    if (reqFeatureIndex != o.reqFeatureIndex)
       return false;
 
-    for (const auto _ : + hb_zip (featureIndex, o.featureIndex))
+    auto iter =
+    + hb_iter (featureIndex)
+    | hb_filter (feature_index_map)
+    | hb_map (feature_index_map)
+    ;
+
+    auto o_iter =
+    + hb_iter (o.featureIndex)
+    | hb_filter (feature_index_map)
+    | hb_map (feature_index_map)
+    ;
+
+    if (iter.len () != o_iter.len ())
+      return false;
+
+    for (const auto _ : + hb_zip (iter, o_iter))
       if (_.first != _.second) return false;
 
     return true;
   }
 
+  void collect_features (hb_prune_langsys_context_t *c) const
+  {
+    if (!has_required_feature () && !get_feature_count ()) return;
+    if (c->visitedLangsys (this)) return;
+    if (has_required_feature () &&
+        c->duplicate_feature_map->has (reqFeatureIndex))
+      c->new_feature_indexes->add (get_required_feature_index ());
+
+    + hb_iter (featureIndex)
+    | hb_filter (c->duplicate_feature_map)
+    | hb_sink (c->new_feature_indexes)
+    ;
+  }
+
   bool subset (hb_subset_context_t        *c,
 	       hb_subset_layout_context_t *l,
 	       const Tag                  *tag = nullptr) const
@@ -581,6 +692,42 @@ struct Script
   bool has_default_lang_sys () const           { return defaultLangSys != 0; }
   const LangSys& get_default_lang_sys () const { return this+defaultLangSys; }
 
+  void prune_langsys (hb_prune_langsys_context_t *c,
+                      unsigned script_index) const
+  {
+    if (!has_default_lang_sys () && !get_lang_sys_count ()) return;
+    if (c->visitedScript (this)) return;
+
+    if (!c->script_langsys_map->has (script_index))
+      c->script_langsys_map->set (script_index, hb_set_create ());
+    
+    unsigned langsys_count = get_lang_sys_count ();
+    if (has_default_lang_sys ())
+    {
+      //only collect features from non-redundant langsys
+      const LangSys& d = get_default_lang_sys ();
+      d.collect_features (c);
+
+      for (auto _ : + hb_zip (langSys, hb_range (langsys_count)))
+      {
+        const LangSys& l = this+_.first.offset;
+        if (l.compare (d, c->duplicate_feature_map)) continue;
+
+        l.collect_features (c);
+        c->script_langsys_map->get (script_index)->add (_.second);
+      }
+    }
+    else
+    {
+      for (auto _ : + hb_zip (langSys, hb_range (langsys_count)))
+      {
+        const LangSys& l = this+_.first.offset;
+        l.collect_features (c);
+        c->script_langsys_map->get (script_index)->add (_.second);
+      }
+    }
+  }
+
   bool subset (hb_subset_context_t         *c,
 	       hb_subset_layout_context_t  *l,
 	       const Tag                   *tag) const
@@ -609,16 +756,17 @@ struct Script
       }
     }
 
-    + langSys.iter ()
-    | hb_filter ([=] (const Record<LangSys>& record) {return l->visitLangSys (); })
-    | hb_filter ([&] (const Record<LangSys>& record)
-		 {
-		   const LangSys& d = this+defaultLangSys;
-		   const LangSys& l = this+record.offset;
-		   return !(l == d);
-		 })
-    | hb_apply (subset_record_array (l, &(out->langSys), this))
-    ;
+    const hb_set_t *active_langsys = l->script_langsys_map->get (l->cur_script_index);
+    if (active_langsys)
+    {
+      unsigned count = langSys.len;
+      + hb_zip (langSys, hb_range (count))
+      | hb_filter (active_langsys, hb_second)
+      | hb_map (hb_first)
+      | hb_filter ([=] (const Record<LangSys>& record) {return l->visitLangSys (); })
+      | hb_apply (subset_record_array (l, &(out->langSys), this))
+      ;
+    }
 
     return_trace (bool (out->langSys.len) || defaultLang || l->table_tag == HB_OT_TAG_GSUB);
   }
@@ -641,7 +789,7 @@ struct Script
   DEFINE_SIZE_ARRAY_SIZED (4, langSys);
 };
 
-typedef RecordListOf<Script> ScriptList;
+typedef RecordListOfScript ScriptList;
 
 
 /* https://docs.microsoft.com/en-us/typography/opentype/spec/features_pt#size */
diff --git a/src/hb-ot-layout-gpos-table.hh b/src/hb-ot-layout-gpos-table.hh
index 85ff4bc84..72a44bf69 100644
--- a/src/hb-ot-layout-gpos-table.hh
+++ b/src/hb-ot-layout-gpos-table.hh
@@ -2666,7 +2666,7 @@ struct GPOS : GSUBGPOS
 
   bool subset (hb_subset_context_t *c) const
   {
-    hb_subset_layout_context_t l (c, tableTag, c->plan->gpos_lookups, c->plan->gpos_features);
+    hb_subset_layout_context_t l (c, tableTag, c->plan->gpos_lookups, c->plan->gpos_langsys, c->plan->gpos_features);
     return GSUBGPOS::subset<PosLookup> (&l);
   }
 
diff --git a/src/hb-ot-layout-gsub-table.hh b/src/hb-ot-layout-gsub-table.hh
index 5d20a7e6b..ee95bbc00 100644
--- a/src/hb-ot-layout-gsub-table.hh
+++ b/src/hb-ot-layout-gsub-table.hh
@@ -1596,7 +1596,7 @@ struct GSUB : GSUBGPOS
 
   bool subset (hb_subset_context_t *c) const
   {
-    hb_subset_layout_context_t l (c, tableTag, c->plan->gsub_lookups, c->plan->gsub_features);
+    hb_subset_layout_context_t l (c, tableTag, c->plan->gsub_lookups, c->plan->gsub_langsys, c->plan->gsub_features);
     return GSUBGPOS::subset<SubstLookup> (&l);
   }
 
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index 887a759f1..6fdf190cc 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -52,7 +52,7 @@ struct hb_intersects_context_t :
   const hb_set_t *glyphs;
 
   hb_intersects_context_t (const hb_set_t *glyphs_) :
-			     glyphs (glyphs_) {}
+                            glyphs (glyphs_) {}
 };
 
 struct hb_have_non_1to1_context_t :
@@ -3587,6 +3587,20 @@ struct GSUBGPOS
     hb_set_subtract (lookup_indexes, &inactive_lookups);
   }
 
+  void prune_langsys (const hb_map_t *duplicate_feature_map,
+                      hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *script_langsys_map,
+                      hb_set_t       *new_feature_indexes /* OUT */) const
+  {
+    hb_prune_langsys_context_t c (this, script_langsys_map, duplicate_feature_map, new_feature_indexes);
+    
+    unsigned count = get_script_count ();
+    for (unsigned script_index = 0; script_index < count; script_index++)
+    {
+      const Script& s = get_script (script_index);
+      s.prune_langsys (&c, script_index);
+    }
+  }
+
   template <typename TLookup>
   bool subset (hb_subset_layout_context_t *c) const
   {
@@ -3627,8 +3641,65 @@ struct GSUBGPOS
     return_trace (true);
   }
 
+  void find_duplicate_features (const hb_map_t *lookup_indices,
+                                const hb_set_t *feature_indices,
+                                hb_map_t *duplicate_feature_map /* OUT */) const
+  {
+    //find out duplicate features after subset
+    unsigned prev = 0xFFFFu;
+    for (unsigned i : feature_indices->iter ())
+    {
+      if (prev == 0xFFFFu)
+      {
+        duplicate_feature_map->set (i, i);
+        prev = i;
+        continue;
+      }
+
+      hb_tag_t t = get_feature_tag (i);
+      hb_tag_t prev_t = get_feature_tag (prev);
+      if (t != prev_t)
+      {
+        duplicate_feature_map->set (i, i);
+        prev = i;
+        continue;
+      }
+
+      const Feature& f = get_feature (i);
+      const Feature& prev_f = get_feature (prev);
+
+      auto f_iter =
+      + hb_iter (f.lookupIndex)
+      | hb_filter (lookup_indices)
+      ;
+
+      auto prev_iter =
+      + hb_iter (prev_f.lookupIndex)
+      | hb_filter (lookup_indices)
+      ;
+
+      if (f_iter.len () != prev_iter.len ())
+      {
+        duplicate_feature_map->set (i, i);
+        prev = i;
+        continue;
+      }
+
+      bool is_equal = true;
+      for (auto _ : + hb_zip (f_iter, prev_iter))
+        if (_.first != _.second) { is_equal = false; break; }
+
+      if (is_equal == true) duplicate_feature_map->set (i, prev);
+      else
+      {
+        duplicate_feature_map->set (i, i);
+        prev = i;
+      }
+    }
+  }
+
   void prune_features (const hb_map_t *lookup_indices, /* IN */
-                       hb_set_t       *feature_indices /* IN/OUT */) const
+		       hb_set_t       *feature_indices /* IN/OUT */) const
   {
 #ifndef HB_NO_VAR
     // This is the set of feature indices which have alternate versions defined
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index d055783a4..e7e805356 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -39,6 +39,7 @@
 #include "hb-ot-stat-table.hh"
 
 
+typedef hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> script_langsys_map;
 #ifndef HB_NO_SUBSET_CFF
 static inline void
 _add_cff_seac_components (const OT::cff1::accelerator_t &cff,
@@ -70,7 +71,8 @@ static inline void
 _gsub_closure_glyphs_lookups_features (hb_face_t *face,
 				       hb_set_t *gids_to_retain,
 				       hb_map_t *gsub_lookups,
-				       hb_map_t *gsub_features)
+				       hb_map_t *gsub_features,
+				       script_langsys_map *gsub_langsys)
 {
   hb_set_t lookup_indices;
   hb_ot_layout_collect_lookups (face,
@@ -96,7 +98,13 @@ _gsub_closure_glyphs_lookups_features (hb_face_t *face,
                                  nullptr,
                                  nullptr,
                                  &feature_indices);
+
   gsub->prune_features (gsub_lookups, &feature_indices);
+  hb_map_t duplicate_feature_map;
+  gsub->find_duplicate_features (gsub_lookups, &feature_indices, &duplicate_feature_map);
+
+  feature_indices.clear ();
+  gsub->prune_langsys (&duplicate_feature_map, gsub_langsys, &feature_indices);
   _remap_indexes (&feature_indices, gsub_features);
 
   gsub.destroy ();
@@ -106,7 +114,8 @@ static inline void
 _gpos_closure_lookups_features (hb_face_t      *face,
 				const hb_set_t *gids_to_retain,
 				hb_map_t       *gpos_lookups,
-				hb_map_t       *gpos_features)
+				hb_map_t       *gpos_features,
+				script_langsys_map *gpos_langsys)
 {
   hb_set_t lookup_indices;
   hb_ot_layout_collect_lookups (face,
@@ -129,8 +138,15 @@ _gpos_closure_lookups_features (hb_face_t      *face,
                                  nullptr,
                                  nullptr,
                                  &feature_indices);
+
   gpos->prune_features (gpos_lookups, &feature_indices);
+  hb_map_t duplicate_feature_map;
+  gpos->find_duplicate_features (gpos_lookups, &feature_indices, &duplicate_feature_map);
+
+  feature_indices.clear ();
+  gpos->prune_langsys (&duplicate_feature_map, gpos_langsys, &feature_indices);
   _remap_indexes (&feature_indices, gpos_features);
+
   gpos.destroy ();
 }
 #endif
@@ -231,10 +247,10 @@ _populate_gids_to_retain (hb_subset_plan_t* plan,
 #ifndef HB_NO_SUBSET_LAYOUT
   if (close_over_gsub)
     // closure all glyphs/lookups/features needed for GSUB substitutions.
-    _gsub_closure_glyphs_lookups_features (plan->source, plan->_glyphset_gsub, plan->gsub_lookups, plan->gsub_features);
+    _gsub_closure_glyphs_lookups_features (plan->source, plan->_glyphset_gsub, plan->gsub_lookups, plan->gsub_features, plan->gsub_langsys);
 
   if (close_over_gpos)
-    _gpos_closure_lookups_features (plan->source, plan->_glyphset_gsub, plan->gpos_lookups, plan->gpos_features);
+    _gpos_closure_lookups_features (plan->source, plan->_glyphset_gsub, plan->gpos_lookups, plan->gpos_features, plan->gpos_langsys);
 #endif
   _remove_invalid_gids (plan->_glyphset_gsub, plan->source->get_num_glyphs ());
 
@@ -356,6 +372,12 @@ hb_subset_plan_create (hb_face_t         *face,
   plan->reverse_glyph_map = hb_map_create ();
   plan->gsub_lookups = hb_map_create ();
   plan->gpos_lookups = hb_map_create ();
+  
+  plan->gsub_langsys = hb_object_create<script_langsys_map> ();
+  plan->gsub_langsys->init_shallow ();
+
+  plan->gpos_langsys = hb_object_create<script_langsys_map> ();
+  plan->gpos_langsys->init_shallow ();
   plan->gsub_features = hb_map_create ();
   plan->gpos_features = hb_map_create ();
   plan->layout_variation_indices = hb_set_create ();
@@ -407,6 +429,19 @@ hb_subset_plan_destroy (hb_subset_plan_t *plan)
   hb_set_destroy (plan->layout_variation_indices);
   hb_map_destroy (plan->layout_variation_idx_map);
 
+  for (auto _ : plan->gsub_langsys->iter ())
+    hb_set_destroy (_.second);
+  
+  hb_object_destroy (plan->gsub_langsys);
+  plan->gsub_langsys->fini_shallow ();
+  free (plan->gsub_langsys);
+
+  for (auto _ : plan->gpos_langsys->iter ())
+    hb_set_destroy (_.second);
+  
+  hb_object_destroy (plan->gpos_langsys);
+  plan->gpos_langsys->fini_shallow ();
+  free (plan->gpos_langsys);
 
   free (plan);
 }
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index cc9cb7a1a..1c070f913 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -79,7 +79,11 @@ struct hb_subset_plan_t
   hb_map_t *gsub_lookups;
   hb_map_t *gpos_lookups;
 
-  //active features we'd like to retain
+  //active langsys we'd like to retain
+  hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *gsub_langsys;
+  hb_hashmap_t<unsigned, hb_set_t *, (unsigned)-1, nullptr> *gpos_langsys;
+
+  //active features after removing redundant langsys and prune_features
   hb_map_t *gsub_features;
   hb_map_t *gpos_features;
 
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 7ae9c56bef348154ea23322569f20190463aaa7a..494dee006d1dc280c4e327628e024f578af426c1 100644
GIT binary patch
delta 240
zcmZqp!*u00(*y&aiYJfw7#Ox~U|?WZnrP#~a`ue#)Qv4uLS)=;uU3ucxB1Gz%>04@
z2u^SrZUoUasv8<Mn}jweDyJ~YF)+Kh`Ghc7Bo-wmF^J?OmgF&5FtC7>{r}Iv%fK-C
z-Zsg47@r3y%*en5lxJmNV_;|CVBlonV&G=rVc<<p%qd|ANXyJiWJt)&%Pe6?%gIm9
zVaUl%P03^^DlRrKWT*g=Mhp!=(wLzONSZKA0+OZ-vw)--!y+JQ&aetdS}<$^+QSC4
RgPlQ|L54wg^StdzYyhhgK(hb<

delta 291
zcmcceo2lUs(*y&af0GL07#Ox~U|?YPn`q<0qHDL~;Kr6IAu_eImoUcj+k9nUW`4l{
z1Shx*H-hNfGgQ}XHVJJ`tnXs<VqkW0^9f;yODsxEVi3tmEXiYtW8h+7bPRG-V9;V<
z`2U}Qmw}OiiGi7cg@KiUje(tkgMkyMf}4Q{C<Bpaz$woHvJhwn57Z146QaOI@Fgea
zlrV%jI|7{%mX?{9$N(fVOBix;@{@BIigHs^G8rn0iwz7J>VTvXLmQAZW|#mZO&DeX
cNmGUeK+=q11&}mn*Z?Fg7<Oz<*<Qc~0Q2)iUjP6A

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644,62D,628.ttf
index d298491190f70d42700bd3fb1bc581c4d6f5782d..f4a1ce43a48b6309e4ec6de61455a14fd9e9006e 100644
GIT binary patch
delta 185
zcmZoU&vfM+(*y&aRp+=u7#J3wVPIhGm}uj|a`ue#)Qv4UZZhklz4YVxZN4%vGrwQ}
zf)iYZ8$oo9>V}5RJnqM%lpPp8FfhBg`GhctBo-wmF^J?OmgF&rFtC7>{r}Iv!@w|E
zW|4$Pa$-&igI8K+ULr$WW?p6qLrQLHN+v^Aaj}6RLjjO9VyFO;#taQW(uAP{NSZQC
Y0Fq`5Gk~Ny!vY{_!LVX;%c6fQ07I5KGynhq

delta 254
zcmca|j;ZB5(*y&aP7nLN3=9j;Ffg!gn`q<0qHDL~;Kr65HyNYGFW2MwZN4%vGrwQ}
zf)iYZ8$tB#8LDeG^SB?6s?T7QV_<f1^9f<FNi0fCVi3tmEXiZAVbEb<bPRG-VBlh4
z`2U}Q2dIaMfti7Yft7)cft`VaffFdh4HRbq83$Iuh(iT$a$-&iLx8g*(2jt#%)CT~
zl+3)$5{9hY)RaskhJxZ^14D)~AZf%<2PBOd+JK}9Lm!YdWtave%^2nZNppr}K+=L?
N-R7`G|5%t97yzqlKP&(M

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.627,644.ttf
index 1b9060690a482fbdf27bd1f3fe969fc75c863f8a..45f11775bd9a02c99ccc90457623d79b7538556f 100644
GIT binary patch
delta 205
zcmX@JfN9PGrU?c-QZr>fF);L=U|?VhnP}s}a`ue#)Qv4uOk}cSo3-QlZN4%vGrwQ}
zf)iYZ8$oo9>V}5RCZ@9^>Kz!KF)+Kh`GhctBo-wmF^J?OmgF&rFtC7>{r}Iv1Ed%k
zm>8IWBCHH-4D1XX44e#H4BQMn$%#273|?uOd5H`mnR%Hd3{knMDVYoj#l;4O3~4~p
rh#?P18Z(puNfU-TAZg0b1|-cG`hcW4!?faJ76S{0d7B&hPB8)i<Onyb

delta 254
zcmbQUfa%NvrU?c-vv01S!objbf`NglX`+n_i>}>{gBx3>n8>XBUYr=uZ}XLbnfV0+
z5S-vL+z6s?&rn^n*~D~qM12OM2m`Z=n@<RXO=3}E5`#!iVo4r@4TBB?qhpYx0s|KV
z!~g#bJU~5649pBH46F=n4D1XX44gn2ZlE{|$T+YHMjR@5lM{1F7y_Iffp!F>W#%O^
zL}lh>mM|pbrlw>XF{Bk28yGU=07)Z;5+G^JPy-}Q7+Qd&DMJsCG-H?oB+VJ-07(mm
OC7Xl#PBAhuFaQA7);^~I

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.633,645,627,621,20,644,627.ttf
index 969fda230c396591becf72a5fe13503cc57edd9d..82976b0e0e48445798743e92701b2af3129d5dd2 100644
GIT binary patch
delta 193
zcmZp9%XH%n(*y$^7bi<q28Inw7#LVLO|)@gIeW%=>c*B6-Yjf9?}H}?_=vF7sBUQ3
zoZ;h~Qt!a<hJo3|%_oFGB(W$li9sYMu_TW{gn@+t2>$<P-~m#M3``8nKoM33HU@SE
z4hBvJE(UG}p5(-w5(cld%)CT~h|Ijq5{9_k)Ratyl;UCoLxwCMX~a+jB#jwrfTRgS
j3y?Hr=mC;u3{!xlIm4XdVip4nh9#S0HfpdkF)#oC>ZUYu

delta 199
zcmccdhN<N((*y&a9U?bP85lM!VPIf=Fww?^Mb~b}!Hq2^yjkL#j;x&=;3L9vdxq+o
z%^5z<DViCKQVh&4ZayIlHi<=vNem)6i6waqHVirpjE+H$3JhEf4FCT#@Gvk;zOX@z
zi-Cm!2tWdp&ux$hVBk$o%qd|AaCQXh4@k?*OJs=4%*!lcNXbo2$z;eXE;cY^C;*a1
o3>84qn4t+snlN+$NmGVNK+=q17LYV&SOg?37*=i8+o-_`0FQP)^8f$<

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout-retain-gids.63A,64A,631.ttf
index 54ef72126ee51e821023e6743a820140ceee93b4..ebc2866c8b6897579199d4a01f21a04f7a34b8af 100644
GIT binary patch
delta 54
zcmbPmo@oLQ8L(^(f22Io#E0eV8Rw}RTPz$|tS#QXo_xSjgr!DxL&N49j&l-Ok`r@E
KHdic`U;zMu-xl-$

delta 54
zcmbPmo@oLQ8L&(>Kg2xI#D_)KZpXomEf$U}d#1Qto_xSjgyr@O)is-MIL=9Aadz|x
K*<7($f&~Cy`W5v6

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 3a64b97a67f11b752ec60ede2a5e583dbcd3c4aa..9862336a0a0ea706c4414ac3605dc25ba7e8424b 100644
GIT binary patch
delta 238
zcmbP|@gjYK0gtA?@eBqAoeK;M>|zsbTv*PYah|%dB}P?-JE%f8p5Nvx12gjr1|T@W
zWw;SU*Qjo2*!)NJHk)z^qZ|XXi<?gfgGFLdViJQ$PGU(Og9QT%NZJ4Y47>~slmF>R
z*2DNbKw(A(CZIek0~-T70|x^q0~Z4~0}lgla$-&iLqJ+)ULr$6W?p6qLt0LLat=dI
zZfZ&<Ls4<DfgwW$kThaw0FuTGT|m-=VG@uuWtasd%@`H|Nppr(K+=L?6VM(updIWC
P(hM>TvYYqmhOq$vdY3$o

delta 289
zcmaEnJ|$y<0nfTW2VXES=v-i6V0W5m<HDkAx8vZ(mKaqTN1;N_cz&C&49v_x1q=))
zxC}Rf=-V??*KGcydYi4ji_wdL*~QH#gdr}mC^3maBqy;Xk0FkMi-FNG$Wehoi-F<)
ze+FI#Mg}GZW(F1pRt7c(b_NaxPM`{I1|FacM4kbsJPXJ|pcy<+Gf+&30vo}XoS0L>
z5a#R%bVgWOW?mu#kjN}y$jQl1&S5CZO-;#Us3<NrFl49$l12<|K+>3D0+2Lem;oeB
a85RIZGlmsF(wt!fkhEafvAIPzg$)3M7eb-{

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644,62D,628.ttf
index a9c3d361e117018b051567b3532b4bf7a8667e25..00f78036bafeede17d3e2af4d9e6d3a1ef4545d4 100644
GIT binary patch
delta 206
zcmez2f5v};0nd!{OT-u$lw24XSlcGrxUif(<2-d^i;s-V1(^f+@%%Pl8JL-0FaW^`
zF2ju=x<++F!{#?K@vQX@3?CSnUEF*^7(^0_5|bE2auQ4O7(^IYK+69AXW#)+j0{W+
z%s>%V1~vwE1`Y;J1}+9}2A<@^oDv4Fw9LFjhPceU%o2u_+|-mzhOFXZ14D)aAZf%<
s0VItX8i1q;LkEyFWtadY%@}3?Nppq;#l<WJ77Qyk|55tG!o<J;09$uB8vp<R

delta 212
zcmX@(|HFTR0gp1f?g0h{B^L$;)-4llTv&ANb{yQ;;v*yT=ft6@@%%Pl8JL-0FaW^`
zF2ju=`t}UfHJjha#ItH<Fv>A7ySVv;FxVs(B_=V5<Rq5lG1xHZFfcj>IVv!4F);l9
z&%ndLFu6cUjEjK<q#GnKIZsI<fPptTF{gwfz}XR~KOikLFOeZ7GcU7*AuBgEC6l3`
wxY)pup$teGG1LJ`V}>>$X~NJ4BuyEn0ZB84c|g*fVHuFLU|6^LoYEf_0N8py!T<mO

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.627,644.ttf
index a535889e23ba9c73bc2d399acaaa5bc13ba63f54..c1537155b77ab995b1d1a13466065dc9aeabd05b 100644
GIT binary patch
delta 188
zcmdm^)T1=PfG74)^h5>*z8wq<Od%6(Tv*PYah|%dC4!6Pa^;?@lOJ%2u+*q-XxRLN
z>o{}01H&^0W*0Y~5C)ONqQoQyk(|VmJO&X476u^r|DS;eNHH=nF)#x~SQ*$D*cmt&
zI2pJYxEXko6LU%!ywWoB5*b1=^D;{qqH<GHG8qzziwz7J(txB9LmrScW+(%aCJc2z
e(v+bMNSZP90ZDU)X~o4X1{MtSHW%=pVgvvo4K!o`

delta 237
zcmeBC+M_hVfag~Er+o|zd^;Ezn3^WqxUlHj?KrrxC4!4ZT66K&$q%?hSZ>cyU9<TI
z*Ky|h3`P+KW*0Y~5C)sXqQoQyk(|VmJO&#E9R^0nAV&oTE(V7G{~34~fMzi;Gq5nQ
zGO#hQGjK3)0%f>?;w(TJhzdp=DtMC<b4nNjoE?F71f*r=B{D>1=4F;JB;=;1WEwG~
z6&D*AGUNbBBZd+nY0OXqBuyAvfTSry50Ertm;xlt8Rh^<3x*||o%l~NGBGd!0Ng7%
AVE_OC

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.633,645,627,621,20,644,627.ttf
index 05774089b56326b467281f2ece187c84324c5e2e..0e5dd57b9f454a30a04fec8814d14666267a2eca 100644
GIT binary patch
delta 203
zcmZn(yb>_MfT#EKtWyjON-G!`Sl3LnabY=o#(C<-784nn^;cH6#`D{JWngB0!2kp&
zxC}Rf=o-}x4V$mX+-9wJV0gp8?BeDV!XT1Zl$gXIl9O1H#~{MM0#f$>KLZbtVq{=q
zU<Qh?GO#hQGjK3)GH@|)Gw>uQ=9DmarDf(NGDKwNWtK3+<))@&GNcq28yGTV0ZAi<
pA|PqZPy-}Q7+Qd&DMJsCG-H?oB+VJ-6c@7?STHQvoS>}43INn*I5PkM

delta 252
zcmcZ-&=NSofJbt>(n|&gr4<YethXlGxUlHj?Krrx#Y9HtX2ynt@%%Pl8JL-0FaW^`
zF2ju=`t}UfHJh)<+-9xMV3cBDc5(9wVX#RoN=#x9$w@59W3XY+VPJF&a#Ud8Vqp0H
zpMeLchlzoifrWvUfsKKkfrEh)D8mgDX8{=pR>6ov1#fa<P6<PRvm?-sfV9lKM25J`
zyv!1Yl-$&mOe2P@;$j0sh5{gI#83ewjTxGNqzOY8kThkO1SHKEW&ufahDAWqf??HW
LBV{F4CI$uoOgcO<

diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.keep-layout.63A,64A,631.ttf
index 8e4c01427d3b3d8bca5bf4725e64e5881568f34a..7d27cb63003dbaf7acc8e6fbd9e0b0a8bab993f0 100644
GIT binary patch
delta 66
zcmbPWJHd8>0gDQwhU`QWAC|LcoTqMVxgspXIX&lUJipCX24?0L3_x&#%Wxxzu2J34
Tu((8ojU_oTr(|=5lmrU^)K3(&

delta 66
zcmbPWJHd8>0Sog(_P-NNd{}htb{yQ;az$9C>(imV@%%Pl8JL-0FaW^`F2ju=`t}Uf
UHH%9`*jSt$eL^-@NJ+2&06r}ivH$=8

diff --git a/test/subset/data/fonts/Amiri-Regular.ttf b/test/subset/data/fonts/Amiri-Regular.ttf
index 47cb4e14e02f5cac59b68b5be7d811747881f1d8..508a1bfce418ab2339271e0821579426bca65161 100644
GIT binary patch
delta 476
zcmeyfT4~8Tr3qqY(`6VK7&zQrT-~PJT~*A$t^wpSzH<-o4?g1M%EiF0`GJAq>pb`1
zP^U1CwnhdH`3VdR<y{kfTv*PYah^7DN`s91BK05f{5D@1n3-PyH8Y&xGTaEFYg9Kh
zG#fCs8!&<}6A&{4F$)m00x{cm14j1a8tGMxY7ERSZayIlB8f$bNemh}i6waqQ4A~~
zBmVzqU<Fc449q~9jX{Zl)iKCXfkDYT*aJxV`a}ZBU_Tci85#s4;W`+hI=C1ZLxQ{&
z7`V1OXt5i9bp`qjXdV~i9_DW-wn~6(W%Ofo0m{N`2>{zt2exGm*p^!$TNpW}&yeSc
z6$Uv@1ZW({aV%ixaZE4ZXO+ex!HG+P3oIdsVbt_IepXpdnB&c+|B&a<#bPcuNV^PI
Sa$-&i!#ohV-9UlkOep|e@Mezy

delta 286
zcmZ3oPU+8Tr3qqYQ@=1UFmSlLxVlZbyQ-LhT?5EveCHnEAAI<=6&nM)<_89buMO_O
zp-%HJJT+zDkS}0hC~KPN<HDkAx8u;nDGf4TU(Hw-&u{aUftmRQP&2~`F2ju=`t}Uf
zHO&T$?FNh>%ml>DK+FQftU%1R-GGt(xQ1s8BL@Ssi<?gfgGgdgViJQ!PGU(OgA)S_
z$cX>{8CZc769Y4lW@F%DU~~*}Q~=U28AhlKQ1$jWEq24N>Wo13Tnt;7-a$>R0-GuV
oHnj?Fg2nVJ@*J_uKyA}MDRAgc_f_OzXK{A)3E3W@$Z@6=0G>EWE&u=k