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

[varLib.merger] Minor

Browse Source
This commit is contained in:
Behdad Esfahbod 2018-01-08 10:31:50 +00:00
parent b624e0c08e
commit e58499cc06
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,9 +283,6 @@ def _PairPosFormat1_merge(self, lst, merger):
'PairSet', 'PairSetCount', 'PairSet', 'PairSetCount',
'ValueFormat1', 'ValueFormat2')) 'ValueFormat1', 'ValueFormat2'))
self.ValueFormat1 = reduce(int.__or__, [l.ValueFormat1 for l in lst], 0)
self.ValueFormat2 = reduce(int.__or__, [l.ValueFormat2 for l in lst], 0)
empty = ot.PairSet() empty = ot.PairSet()
empty.PairValueRecord = [] empty.PairValueRecord = []
empty.PairValueCount = 0 empty.PairValueCount = 0
@ -442,9 +439,6 @@ def _PairPosFormat2_merge(self, lst, merger):
'Class1Record', 'Class1Record',
'ValueFormat1', 'ValueFormat2')) 'ValueFormat1', 'ValueFormat2'))
self.ValueFormat1 = reduce(int.__or__, [l.ValueFormat1 for l in lst], 0)
self.ValueFormat2 = reduce(int.__or__, [l.ValueFormat2 for l in lst], 0)
# Align coverages # Align coverages
glyphs, _ = _merge_GlyphOrders(merger.font, glyphs, _ = _merge_GlyphOrders(merger.font,
[v.Coverage.glyphs for v in lst]) [v.Coverage.glyphs for v in lst])
@ -468,9 +462,8 @@ def _PairPosFormat2_merge(self, lst, merger):
@AligningMerger.merger(ot.PairPos) @AligningMerger.merger(ot.PairPos)
def merge(merger, self, lst): def merge(merger, self, lst):
# TODO Support differing ValueFormats. merger.valueFormat1 = self.ValueFormat1 = reduce(int.__or__, [l.ValueFormat1 for l in lst], 0)
merger.valueFormat1 = self.ValueFormat1 merger.valueFormat2 = self.ValueFormat2 = reduce(int.__or__, [l.ValueFormat2 for l in lst], 0)
merger.valueFormat2 = self.ValueFormat2
if self.Format == 1: if self.Format == 1:
_PairPosFormat1_merge(self, lst, merger) _PairPosFormat1_merge(self, lst, merger)