diff --git a/Lib/fontTools/varLib/mutator.py b/Lib/fontTools/varLib/mutator.py index 795cde55d..74d08e61d 100644 --- a/Lib/fontTools/varLib/mutator.py +++ b/Lib/fontTools/varLib/mutator.py @@ -112,6 +112,17 @@ def instantiateVariableFont(varfont, location, inplace=False): log.info("Building interpolated tables") merger.instantiate() + if 'name' in varfont: + log.info("Pruning name table") + exclude = {a.axisNameID for a in fvar.axes} + for i in fvar.instances: + exclude.add(i.subfamilyNameID) + exclude.add(i.postscriptNameID) + varfont['name'].names[:] = [ + n for n in varfont['name'].names + if n.nameID not in exclude + ] + log.info("Removing variable tables") for tag in ('avar','cvar','fvar','gvar','HVAR','MVAR','VVAR','STAT'): if tag in varfont: diff --git a/Tests/varLib/data/test_results/Mutator.ttx b/Tests/varLib/data/test_results/Mutator.ttx index 878e05c15..75f0035cb 100644 --- a/Tests/varLib/data/test_results/Mutator.ttx +++ b/Tests/varLib/data/test_results/Mutator.ttx @@ -440,60 +440,6 @@ - - Weight - - - Contrast - - - ExtraLight - - - TestFamily-ExtraLight - - - Light - - - TestFamily-Light - - - Regular - - - TestFamily-Regular - - - Semibold - - - TestFamily-Semibold - - - Bold - - - TestFamily-Bold - - - Black - - - TestFamily-Black - - - Black Medium Contrast - - - TestFamily-BlackMediumContrast - - - Black High Contrast - - - TestFamily-BlackHighContrast - Test Family @@ -518,60 +464,6 @@ Master 1 - - Weight - - - Contrast - - - ExtraLight - - - TestFamily-ExtraLight - - - Light - - - TestFamily-Light - - - Regular - - - TestFamily-Regular - - - Semibold - - - TestFamily-Semibold - - - Bold - - - TestFamily-Bold - - - Black - - - TestFamily-Black - - - Black Medium Contrast - - - TestFamily-BlackMediumContrast - - - Black High Contrast - - - TestFamily-BlackHighContrast - diff --git a/Tests/varLib/data/test_results/Mutator_IUP-instance.ttx b/Tests/varLib/data/test_results/Mutator_IUP-instance.ttx index 8b33fd7c9..892f0ceeb 100755 --- a/Tests/varLib/data/test_results/Mutator_IUP-instance.ttx +++ b/Tests/varLib/data/test_results/Mutator_IUP-instance.ttx @@ -237,15 +237,6 @@ VarFont-Regular - - Width - - - Ascender - - - Regular - VarFont @@ -261,15 +252,6 @@ VarFont-Regular - - Width - - - Ascender - - - Regular -