2 files changed, 5 insertions, 7 deletions
diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py
index a785c10..72119e0 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 *
+from fontbuild.features import generateFeatureFile, readFeatureFile, readGlyphClasses, writeFeatureFile
 from fontbuild.markFeature import GenerateFeature_mark
 from fontbuild.mkmkFeature import GenerateFeature_mkmk
 from fontbuild.decomposeGlyph import decomposeGlyph
diff --git a/scripts/lib/fontbuild/features.py b/scripts/lib/fontbuild/features.py
index 3c4c1d0..1519034 100755
--- a/scripts/lib/fontbuild/features.py
+++ b/scripts/lib/fontbuild/features.py
@@ -12,9 +12,9 @@ _className = re.compile(r"@%s{,29}" % _glyphNameChars)
 _classValToken = (
     r"(?:%s|%s(?:\s*-\s*%s)?)" % (_className.pattern, _glyphName, _glyphName))
 _classVal = re.compile(
-    r"\[(\s*%s(?:\s+%s)*)\s*\]" % (_classValToken, _classValToken))
+    r"\[\s*(%s(?:\s+%s)*)\s*\]" % (_classValToken, _classValToken))
 _classDef = re.compile(
-    r"(%s)\s*=\s*%s;" % (_className.pattern, _classVal.pattern))
+    r"(%s)\s*=\s*%s\s*;" % (_className.pattern, _classVal.pattern))
 _featureDef = re.compile(
     r"(feature\s+(?P<tag>[A-Za-z]{4})\s+\{.*?\}\s+(?P=tag)\s*;\s*?\n)",
     re.DOTALL)
@@ -26,8 +26,7 @@ def readFeatureFile(font, text):
     """Incorporate valid definitions from feature text into font."""
 
     readGlyphClasses(font, text)
-    lines = [l for l in re.split(r"[\r\n]+", text) if not _comment.match(l)]
-    text = "\n".join(lines)
+    text = "\n".join([l for l in text.splitlines() if not _comment.match(l)])
 
     errorMsg = "feature definition %s (definition removed)"
     if not hasattr(font.features, "tags"):
@@ -48,8 +47,7 @@ def readFeatureFile(font, text):
 def readGlyphClasses(font, text, update=True):
     """Incorporate valid glyph classes from feature text into font."""
 
-    lines = [l for l in re.split(r"[\r\n]+", text) if not _comment.match(l)]
-    text = "\n".join(lines)
+    text = "\n".join([l for l in text.splitlines() if not _comment.match(l)])
 
     errorMsg = "glyph class definition %s (reference removed)"
     if not hasattr(font, "classNames"):