From ec9436d7f604150f1566f6042391c7b3e800b115 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 6 Dec 2013 21:58:41 -0500
Subject: [PATCH] [subset] Remove unreferenced features

---
 Lib/fontTools/subset.py | 36 +++++++++++++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 5 deletions(-)

diff --git a/Lib/fontTools/subset.py b/Lib/fontTools/subset.py
index 966afb46f..3048a84f9 100644
--- a/Lib/fontTools/subset.py
+++ b/Lib/fontTools/subset.py
@@ -1064,6 +1064,19 @@ def subset_feature_tags(self, feature_tags):
   if self.table.ScriptList:
     self.table.ScriptList.subset_features(feature_indices)
 
+@_add_method(ttLib.getTableClass('GSUB'),
+             ttLib.getTableClass('GPOS'))
+def prune_features(self):
+  "Remove unreferenced featurs"
+  if self.table.ScriptList:
+    feature_indices = self.table.ScriptList.collect_features()
+  else:
+    feature_indices = []
+  if self.table.FeatureList:
+    self.table.FeatureList.subset_features(feature_indices)
+  if self.table.ScriptList:
+    self.table.ScriptList.subset_features(feature_indices)
+
 @_add_method(ttLib.getTableClass('GSUB'),
              ttLib.getTableClass('GPOS'))
 def prune_pre_subset(self, options):
@@ -1081,15 +1094,28 @@ def prune_pre_subset(self, options):
              ttLib.getTableClass('GPOS'))
 def prune_post_subset(self, options):
   table = self.table
-  if table.ScriptList and not table.ScriptList.ScriptRecord:
-    table.ScriptList = None
-  if table.FeatureList and not table.FeatureList.FeatureRecord:
-    table.FeatureList = None
-  # Prune lookups themselves
+
+  # LookupList looks good.  Just prune lookups themselves
   if table.LookupList:
     table.LookupList.prune_post_subset(options);
     if not table.LookupList.Lookup:
       table.LookupList = None
+
+  if not table.LookupList:
+    table.FeatureList = None
+
+  if table.FeatureList:
+    # Remove unreferenced features
+    self.prune_features()
+
+  if table.FeatureList and not table.FeatureList.FeatureRecord:
+    table.FeatureList = None
+
+  # Never drop scripts themselves as them just being available
+  # holds semantic significance.
+  if table.ScriptList and not table.ScriptList.ScriptRecord:
+    table.ScriptList = None
+
   return True
 
 @_add_method(ttLib.getTableClass('GDEF'))