Merge pull request #627 from googlefonts/variable-colr

disable COLR layer reuse for interpolatable masters when building variable fonts

Lib/ufo2ft/__init__.py

@@ -98,6 +98,7 @@ def call_postprocessor(otf, ufo, glyphSet, *, postProcessorClass, **kwargs):
     skipExportGlyphs=None,
     debugFeatureFile=None,
     notdefGlyph=None,
+    colrLayerReuse=True,
 )
 
 compileOTF_args = {
@@ -258,6 +259,7 @@ def compileTTF(ufo, **kwargs):
         reverseDirection=True,
         flattenComponents=False,
         layerNames=None,
+        colrLayerReuse=False,
     ),
 }
 
@@ -392,6 +394,7 @@ def compileInterpolatableTTFsFromDS(designSpaceDoc, **kwargs):
         featureCompilerClass=None,
         roundTolerance=None,
         optimizeCFF=CFFOptimization.NONE,
+        colrLayerReuse=False,
     ),
 }
 
@@ -582,6 +585,7 @@ def compileVariableTTFs(designSpaceDoc: DesignSpaceDocument, **kwargs):
     optimizeGvar = kwargs.pop("optimizeGvar")
     excludeVariationTables = kwargs.pop("excludeVariationTables")
     variableFontNames = kwargs.pop("variableFontNames")
+    colrLayerReuse = kwargs.pop("colrLayerReuse")
 
     # Pop inplace because we'll make a copy at this level so deeper functions
     # don't need to worry
@@ -603,6 +607,7 @@ def compileVariableTTFs(designSpaceDoc: DesignSpaceDocument, **kwargs):
         exclude=excludeVariationTables,
         optimize=optimizeGvar,
         skip_vf=lambda vf_name: variableFontNames and vf_name not in variableFontNames,
+        colr_layer_reuse=colrLayerReuse,
     )
 
     for vfName, varfont in list(vfNameToTTFont.items()):
@@ -692,6 +697,7 @@ def compileVariableCFF2s(designSpaceDoc, **kwargs):
     excludeVariationTables = kwargs.pop("excludeVariationTables")
     optimizeCFF = CFFOptimization(kwargs.pop("optimizeCFF"))
     variableFontNames = kwargs.pop("variableFontNames")
+    colrLayerReuse = kwargs.pop("colrLayerReuse")
 
     # Pop inplace because we'll make a copy at this level so deeper functions
     # don't need to worry
@@ -716,6 +722,7 @@ def compileVariableCFF2s(designSpaceDoc, **kwargs):
         # https://github.com/fonttools/fonttools/pull/1979
         optimize=optimizeCFF >= CFFOptimization.SPECIALIZE,
         skip_vf=lambda vf_name: variableFontNames and vf_name not in variableFontNames,
+        colr_layer_reuse=colrLayerReuse,
     )
 
     for vfName, varfont in list(vfNameToTTFont.items()):

Lib/ufo2ft/featureWriters/markFeatureWriter.py

@@ -559,7 +559,7 @@ def _groupAttachments(self, attachments):
                 # We keep the NamedAnchor if the markClass is allowed in the
                 # current lookup.
                 def include(anchor):
-                    return anchor.markClass.name in markClasses
+                    return anchor.markClass.name in markClasses  # noqa: B023
 
                 filteredAttachment = attachment.filter(include)
                 if filteredAttachment:

Lib/ufo2ft/outlineCompiler.py

@@ -94,7 +94,13 @@ class BaseOutlineCompiler:
     )
 
     def __init__(
-        self, font, glyphSet=None, glyphOrder=None, tables=None, notdefGlyph=None
+        self,
+        font,
+        glyphSet=None,
+        glyphOrder=None,
+        tables=None,
+        notdefGlyph=None,
+        colrLayerReuse=True,
     ):
         self.ufo = font
         # use the previously filtered glyphSet, if any
@@ -110,6 +116,7 @@ def __init__(
         self.unicodeToGlyphNameMapping = self.makeUnicodeToGlyphNameMapping()
         if tables is not None:
             self.tables = tables
+        self.colrLayerReuse = colrLayerReuse
         # cached values defined later on
         self._glyphBoundingBoxes = None
         self._fontBoundingBox = None
@@ -967,6 +974,7 @@ def setupTable_COLR(self):
                 layerInfo,
                 glyphMap=glyphMap,
                 clipBoxes=clipBoxes,
+                allowLayerReuse=self.colrLayerReuse,
             )
 
     def setupTable_CPAL(self):

requirements.txt

@@ -1,4 +1,4 @@
-fonttools[lxml,ufo]==4.33.3
+fonttools[lxml,ufo]==4.34.0
 defcon==0.10.0
 cu2qu==1.6.7.post1
 compreffor==0.5.1.post1

setup.py

@@ -29,7 +29,7 @@
     setup_requires=pytest_runner + wheel + ["setuptools_scm"],
     tests_require=["pytest>=2.8"],
     install_requires=[
-        "fonttools[ufo]>=4.33.3",
+        "fonttools[ufo]>=4.34.0",
         "cu2qu>=1.6.7",
         "cffsubr>=0.2.8",
         "booleanOperations>=0.9.0",