remove overlaps in generated fonts; update to newer FontTools API to do this

Author: arrowtype

scripts/dlig2calt.py

@@ -50,7 +50,7 @@ def dlig2calt(fontPath, inplace=False):
     for glyphName in font.getGlyphNames():
         if font['hmtx'][glyphName][0] > unitWidth:
 
-            decomposeAndRemoveOverlap(font, glyphName)
+            # decomposeAndRemoveOverlap(font, glyphName)
 
             # set width to space (e.g. 600), then offset left side to be negative
             oldWidth = font['hmtx'][glyphName][0]
@@ -60,15 +60,17 @@ def dlig2calt(fontPath, inplace=False):
             font['hmtx'].__setitem__(glyphName, (unitWidth, newLSB))
 
             # Adjust coordinates in glyf table
-            coords = font['glyf'][glyphName].coordinates
-            phantoms = font['glyf'].getPhantomPoints(glyphName, font)
+            coords = font['glyf']._getCoordinatesAndControls(glyphName, font['hmtx'].metrics)[0]
+            phantoms = font['glyf']._getPhantomPoints(glyphName, font['hmtx'].metrics)
+
+            # take off last four items of coords to allow adjusted phantoms to be handled separately, then combined
+            coords = coords[:len(coords)-4]
 
             adjustedCoords = [(x-widthDiff, y) for x, y in coords]
             adjustedPhantoms = [(0,0), (600,0), phantoms[-2], phantoms[-1]]
 
             newCoords = adjustedCoords+adjustedPhantoms
-            # print(glyphName, newCoords, font) # DEBUGGING
-            font['glyf'].setCoordinates(glyphName, newCoords, font)
+            font['glyf']._setCoordinates(glyphName, newCoords, font['hmtx'].metrics)
 
 
     # add new feature code, using calt rather than dlig

scripts/instantiate-code-fonts.py

@@ -18,6 +18,7 @@
 import logging
 import ttfautohint
 from fontTools.varLib import instancer
+from fontTools.varLib.instancer import OverlapMode
 from opentype_feature_freezer import cli as pyftfeatfreeze
 from dlig2calt import dlig2calt
 from mergePowerlineFont import mergePowerlineFont
@@ -100,6 +101,7 @@ def splitFont(
                 "slnt": fontOptions["Fonts"][instance]["slnt"],
                 "CRSV": fontOptions["Fonts"][instance]["CRSV"],
             },
+            overlap=OverlapMode.REMOVE
         )
 
         # UPDATE NAME ID 6, postscript name