Use feaTools in features.py.

Use an existing library for parsing OpenType features, which should be more robust (though this library does have some syntax parsing issues, addressed in our code).

1 files changed, 3 insertions, 5 deletions

diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py
index a3c7d54..c524e7a 100644
--- a/scripts/lib/fontbuild/Build.py
+++ b/scripts/lib/fontbuild/Build.py
@@ -6,7 +6,7 @@ from fontbuild.convertCurves import glyphCurvesToQuadratic
 from fontbuild.mitreGlyph import mitreGlyph
 from fontbuild.generateGlyph import generateGlyph
 from fontTools.misc.transform import Transform
-from fontbuild.features import generateFeatureFile, readFeatureFile, readGlyphClasses, writeFeatureFile
+from fontbuild.features import readFeatureFile, writeFeatureFile
 from fontbuild.markFeature import GenerateFeature_mark
 from fontbuild.mkmkFeature import GenerateFeature_mkmk
 from fontbuild.decomposeGlyph import decomposeGlyph
@@ -142,8 +142,7 @@ class FontProject:
         log(">> Generating glyphs")
         generateGlyphs(f, self.diacriticList, self.adobeGlyphList)
         log(">> Copying features")
-        readGlyphClasses(f, self.ot_classes)
-        readFeatureFile(f, self.basefont.features.text)
+        readFeatureFile(f, self.ot_classes + self.basefont.features.text)
         log(">> Decomposing")
         for gname in self.decompose:
             if f.has_key(gname):
@@ -156,10 +155,9 @@ class FontProject:
 
         if kern:
             log(">> Generating kern classes")
-            readGlyphClasses(f, self.ot_kerningclasses, update=False)
+            readFeatureFile(f, self.ot_kerningclasses)
 
         log(">> Generating font files")
-        generateFeatureFile(f)
         ufoName = self.generateOutputPath(f, "ufo")
         f.save(ufoName)