diff --git a/Lib/fontTools/ttLib/tables/_c_v_t.py b/Lib/fontTools/ttLib/tables/_c_v_t.py index 4fbee7bfc..15094f551 100644 --- a/Lib/fontTools/ttLib/tables/_c_v_t.py +++ b/Lib/fontTools/ttLib/tables/_c_v_t.py @@ -1,4 +1,5 @@ from __future__ import print_function, division, absolute_import +from numbers import Number from fontTools.misc.py23 import * from fontTools.misc.textTools import safeEval from . import DefaultTable @@ -47,3 +48,34 @@ class table__c_v_t(DefaultTable.DefaultTable): def __delitem__(self, index): del self.values[index] + + +class CVTValues(object): + """ This is used in varLib for calculating control value deltas""" + + def __init__(self, values): + self.values = list(values) + + def __getitem__(self, index): + return self.values[index] + + def __len__(self): + return len(self.values) + + def __repr__(self): + return u"CVTValues(%s)" % self.values + + def __isub__(self, other): + if isinstance(other, CVTValues): + assert len(self.values) == len(other) + self.values = [self.values[i] - other.values[i] for i in range(len(self.values))] + return self + if isinstance(other, Number): + self.values = [v - other for v in self.values] + return self + return NotImplemented + + def __mul__(self, other): + if isinstance(other, Number): + return CVTValues([v * other for v in self.values]) + return NotImplemented diff --git a/Lib/fontTools/varLib/__init__.py b/Lib/fontTools/varLib/__init__.py index 98e8f3ec7..3c5c1f207 100644 --- a/Lib/fontTools/varLib/__init__.py +++ b/Lib/fontTools/varLib/__init__.py @@ -23,6 +23,7 @@ from __future__ import unicode_literals from fontTools.misc.py23 import * from fontTools.ttLib import TTFont, newTable from fontTools.ttLib.tables._n_a_m_e import NameRecord +from fontTools.ttLib.tables._c_v_t import CVTValues from fontTools.ttLib.tables._f_v_a_r import Axis, NamedInstance from fontTools.ttLib.tables._g_l_y_f import GlyphCoordinates from fontTools.ttLib.tables.TupleVariation import TupleVariation @@ -502,6 +503,30 @@ def _add_gvar(font, model, master_ttfs, tolerance=0.5, optimize=True): gvar.variations[glyph].append(var) +def _add_cvar(font, model, master_ttfs, tolerance=0.5): + + log.info("Generating cvar") + assert "cvar" not in font + cvar = font["cvar"] = newTable('cvar') + cvar.version = 1 + cvar.variations = [] + + allCVTs = [CVTValues(m["cvt "].values) for m in master_ttfs] + num_cvts0 = len(allCVTs[0]) + + if (any(len(c) != num_cvts0 for c in allCVTs)): + log.warning("Master has incompatible cvt table, not building cvar table.") + del font["cvar"] + return + deltas = model.getDeltas(allCVTs) + supports = model.supports + for i,(delta,support) in enumerate(zip(deltas[1:], supports[1:])): + delta = [int(round(d)) for d in delta] + if all(abs(v) <= tolerance for v in delta): + continue + var = TupleVariation(support, delta) + cvar.variations.append(var) + def _add_HVAR(font, model, master_ttfs, axisTags): log.info("Generating HVAR") @@ -856,6 +881,8 @@ def build(designspace_filename, master_finder=lambda s:s): _merge_OTL(vf, model, master_fonts, axisTags) if 'glyf' in vf: _add_gvar(vf, model, master_fonts) + if 'cvt ' in vf: + _add_cvar(vf, model, master_fonts) return vf, model, master_ttfs diff --git a/Lib/fontTools/varLib/mutator.py b/Lib/fontTools/varLib/mutator.py index d685db2e1..580e38516 100644 --- a/Lib/fontTools/varLib/mutator.py +++ b/Lib/fontTools/varLib/mutator.py @@ -152,6 +152,21 @@ def main(args=None): coordinates += GlyphCoordinates(delta) * scalar _SetCoordinates(varfont, glyphname, coordinates) + # Interpolate cvt + + if 'cvar' in varfont: + cvar = varfont['cvar'] + cvt = varfont['cvt '] + deltas = {} + for var in cvar.variations: + scalar = supportScalar(loc, var.axes) + if not scalar: continue + for i, c in enumerate(var.coordinates): + if c is not None: + deltas[i] = deltas.get(i, 0) + scalar * c + for i, delta in deltas.items(): + cvt[i] += int(round(delta)) + print("Removing variable tables") for tag in ('avar','cvar','fvar','gvar','HVAR','MVAR','VVAR','STAT'): if tag in varfont: diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master0.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master0.ttx index 347da48e6..d738f8646 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master0.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master0.ttx @@ -149,6 +149,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master1.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master1.ttx index a1229ac76..7beabc04c 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master1.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master1.ttx @@ -149,6 +149,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master2.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master2.ttx index 2bac5542f..3e20faca6 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master2.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master2.ttx @@ -149,6 +149,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master3.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master3.ttx index 71078318b..e1d0375df 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master3.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master3.ttx @@ -149,6 +149,11 @@ + + + + + diff --git a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master4.ttx b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master4.ttx index 9c7d6e320..c0946fd19 100644 --- a/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master4.ttx +++ b/Tests/varLib/data/master_ttx_interpolatable_ttf/TestFamily-Master4.ttx @@ -149,6 +149,11 @@ + + + + + diff --git a/Tests/varLib/data/test_results/BuildMain.ttx b/Tests/varLib/data/test_results/BuildMain.ttx index c8941d932..701f278ee 100644 --- a/Tests/varLib/data/test_results/BuildMain.ttx +++ b/Tests/varLib/data/test_results/BuildMain.ttx @@ -128,6 +128,11 @@ + + + + + @@ -848,6 +853,20 @@ + + + + + + + + + + + + + + diff --git a/Tests/varLib/data/test_results/InterpolateLayoutMain.ttx b/Tests/varLib/data/test_results/InterpolateLayoutMain.ttx index dc6caf7e2..cc5cf4e25 100644 --- a/Tests/varLib/data/test_results/InterpolateLayoutMain.ttx +++ b/Tests/varLib/data/test_results/InterpolateLayoutMain.ttx @@ -128,6 +128,11 @@ + + + + + diff --git a/Tests/varLib/data/test_results/Mutator.ttx b/Tests/varLib/data/test_results/Mutator.ttx index 2467eb33f..289564696 100644 --- a/Tests/varLib/data/test_results/Mutator.ttx +++ b/Tests/varLib/data/test_results/Mutator.ttx @@ -128,6 +128,11 @@ + + + + +