shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[varLib] Move code around

Browse Source
This commit is contained in:
Behdad Esfahbod 2017-02-05 18:52:27 -08:00
parent b5c34ceb15
commit ef0eb9dc8f
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lib/fontTools/varLib/merger.py
View File

@ -272,14 +272,7 @@ def merge(merger, self, lst):
merger.mergeLists(self.PairValueRecord, padded) merger.mergeLists(self.PairValueRecord, padded)
@AligningMerger.merger(ot.PairPos) def _PairPosFormat1_merge(self, lst, merger):
def merge(merger, self, lst):
# TODO Support differing ValueFormats.
merger.valueFormat1 = self.ValueFormat1
merger.valueFormat2 = self.ValueFormat2
if self.Format == 1:
# Merge everything else; makes sure Format is the same. # Merge everything else; makes sure Format is the same.
merger.mergeObjects(self, lst, merger.mergeObjects(self, lst,
exclude=('Coverage', exclude=('Coverage',
@ -303,11 +296,20 @@ def merge(merger, self, lst):
merger.mergeLists(self.PairSet, padded) merger.mergeLists(self.PairSet, padded)
elif self.Format == 2: def _PairPosFormat2_merge(self, lst, merger):
# Everything must match; we don't support smart merge yet. # Everything must match; we don't support smart merge yet.
merger.mergeObjects(self, lst) merger.mergeObjects(self, lst)
@AligningMerger.merger(ot.PairPos)
def merge(merger, self, lst):
# TODO Support differing ValueFormats.
merger.valueFormat1 = self.ValueFormat1
merger.valueFormat2 = self.ValueFormat2
if self.Format == 1:
_PairPosFormat1_merge(self, lst, merger)
elif self.Format == 2:
_PairPosFormat2_merge(self, lst, merger)
else: else:
assert 0 assert 0