Move removeGlyphOverlap to main build script.

Another small function which probably does not warrant a separate module.

2 files changed, 10 insertions, 11 deletions

diff --git a/scripts/lib/fontbuild/Build.py b/scripts/lib/fontbuild/Build.py
index b02ae8b..fcdb3c1 100644
--- a/scripts/lib/fontbuild/Build.py
+++ b/scripts/lib/fontbuild/Build.py
@@ -1,3 +1,4 @@
+from booleanOperations import BooleanOperationManager
 from robofab.world import OpenFont
 from fontbuild.mix import Mix,Master,narrowFLGlyph
 from fontbuild.instanceNames import setNamesRF
@@ -10,7 +11,6 @@ from fontbuild.features import readFeatureFile, writeFeatureFile
 from fontbuild.markFeature import GenerateFeature_mark
 from fontbuild.mkmkFeature import GenerateFeature_mkmk
 from fontbuild.decomposeGlyph import decomposeGlyph
-from fontbuild.removeGlyphOverlap import removeGlyphOverlap
 import ConfigParser
 import os
 
@@ -252,6 +252,15 @@ def deleteGlyphs(f, deleteList):
             f.removeGlyph(name)
 
 
+def removeGlyphOverlap(glyph):
+    """Remove overlaps in contours from a glyph."""
+    #TODO(jamesgk) verify overlaps exist first, as per library's recommendation
+    manager = BooleanOperationManager()
+    contours = glyph.contours
+    glyph.clearContours()
+    manager.union(contours, glyph.getPointPen())
+
+
 def saveOTF(font, destFile, autohint=False):
     """Save a RoboFab font as an OTF binary using ufo2fdk."""
 
diff --git a/scripts/lib/fontbuild/removeGlyphOverlap.py b/scripts/lib/fontbuild/removeGlyphOverlap.py
deleted file mode 100644
index 844f041..0000000
--- a/scripts/lib/fontbuild/removeGlyphOverlap.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from booleanOperations import BooleanOperationManager
-
-
-def removeGlyphOverlap(glyph):
-    """Remove overlaps in contours from a glyph."""
-    #TODO(jamesgk) verify overlaps exist first, as per library's recommendation
-    manager = BooleanOperationManager()
-    contours = glyph.contours
-    glyph.clearContours()
-    manager.union(contours, glyph.getPointPen())