From dfff5134e5a7735263fcca619d1518a3c208c6c2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 9 Nov 2018 01:02:45 -0500 Subject: [PATCH] [varLib] Towards sharing merge logic of MarkBasePos for MarkMarkPos --- Lib/fontTools/varLib/merger.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/fontTools/varLib/merger.py b/Lib/fontTools/varLib/merger.py index 82e2256a7..9d03b8cf7 100644 --- a/Lib/fontTools/varLib/merger.py +++ b/Lib/fontTools/varLib/merger.py @@ -533,8 +533,8 @@ def _MarkBasePosFormat1_merge(self, lst, merger): [l.BaseArray.BaseRecord for l in lst]) # MarkArray - self.MarkArray = ot.MarkArray() - self.MarkArray.MarkRecord = records = [] + self.MarkArray = array = ot.MarkArray() + array.MarkRecord = records = [] for g,glyphRecords in zip(self.MarkCoverage.glyphs, zip(*MarkRecords)): allClasses = [r.Class for r in glyphRecords if r is not None] @@ -565,11 +565,11 @@ def _MarkBasePosFormat1_merge(self, lst, merger): merger.mergeThings(anchor, [None if r is None else r.MarkAnchor for r in glyphRecords]) records.append(rec) - self.MarkArray.MarkCount = len(self.MarkArray.MarkRecord) + array.MarkCount = len(array.MarkRecord) # BaseArray - self.BaseArray = ot.BaseArray() - self.BaseArray.BaseRecord = records = [] + self.BaseArray = array = ot.BaseArray() + array.BaseRecord = records = [] for g,glyphRecords in zip(self.BaseCoverage.glyphs, zip(*BaseRecords)): if allSameAs(None, glyphRecords): rec = None @@ -588,7 +588,7 @@ def _MarkBasePosFormat1_merge(self, lst, merger): merger.mergeThings(anchor, allAnchors) anchors.append(anchor) records.append(rec) - self.BaseArray.BaseCount = len(self.BaseArray.BaseRecord) + array.BaseCount = len(array.BaseRecord) @AligningMerger.merger(ot.MarkBasePos) def merge(merger, self, lst):