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

Code clean-up of items pointed out in review.

Browse Source 
removed unused dicts
Remove print statement
Rename v_orig_mapping_i to v_orig_mapping. The suffix was left over from an earlier pass, when there was a mapping for the direct store and another one for the indirect store.
This commit is contained in:
ReadRoberts 2019-03-26 10:45:04 -07:00
parent 1fe0348bad
commit c06c5c5087
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/fontTools/varLib/__init__.py
View File

@ -463,18 +463,6 @@ def _merge_TTHinting(font, masterModel, master_ttfs, tolerance=0.5):
var = TupleVariation(support, delta) var = TupleVariation(support, delta)
cvar.variations.append(var) cvar.variations.append(var)
hvar_fields = { 'table_tag': 'HVAR',
'metrics_tag': 'hmtx',
'sb1': 'LsbMap',
'sb2': 'RsbMap',
'mapping_name': 'AdvWidthMap',
}
vvar_fields = { 'table_tag': 'VVAR',
'metrics_tag': 'vmtx',
'bearing1': 'TsbMap',
'bearing2': 'BsbMap',
'mapping': 'AdvHeightMap',
}
MetricsFields = namedtuple('MetricsFields', MetricsFields = namedtuple('MetricsFields',
['table_tag', 'metrics_tag', 'sb1', 'sb2', 'adv_mapping', 'vorig_mapping']) ['table_tag', 'metrics_tag', 'sb1', 'sb2', 'adv_mapping', 'vorig_mapping'])
@ -551,7 +539,6 @@ def _get_advance_metrics(font, masterModel, master_ttfs,
# glyphs which have a non-default vOrig. # glyphs which have a non-default vOrig.
vOrigs = [metrics[glyph] if glyph in metrics else defaultVOrig vOrigs = [metrics[glyph] if glyph in metrics else defaultVOrig
for metrics, defaultVOrig in v_orig_metricses] for metrics, defaultVOrig in v_orig_metricses]
print(glyph, vOrigs)
vOrigDeltasAndSupports[glyph] = masterModel.getDeltasAndSupports(vOrigs) vOrigDeltasAndSupports[glyph] = masterModel.getDeltasAndSupports(vOrigs)
directStore = None directStore = None
@ -575,11 +562,11 @@ def _get_advance_metrics(font, masterModel, master_ttfs,
adv_mapping[glyphName] = storeBuilder.storeDeltas(deltas) adv_mapping[glyphName] = storeBuilder.storeDeltas(deltas)
if v_orig_metricses: if v_orig_metricses:
v_orig_mapping_i = {} v_orig_mapping = {}
for glyphName in glyphOrder: for glyphName in glyphOrder:
deltas, supports = vOrigDeltasAndSupports[glyphName] deltas, supports = vOrigDeltasAndSupports[glyphName]
storeBuilder.setSupports(supports) storeBuilder.setSupports(supports)
v_orig_mapping_i[glyphName] = storeBuilder.storeDeltas(deltas) v_orig_mapping[glyphName] = storeBuilder.storeDeltas(deltas)
indirectStore = storeBuilder.finish() indirectStore = storeBuilder.finish()
mapping2 = indirectStore.optimize() mapping2 = indirectStore.optimize()
@ -587,7 +574,7 @@ def _get_advance_metrics(font, masterModel, master_ttfs,
advanceMapping = builder.buildVarIdxMap(adv_mapping, glyphOrder) advanceMapping = builder.buildVarIdxMap(adv_mapping, glyphOrder)
if v_orig_metricses: if v_orig_metricses:
v_orig_mapping_i = [mapping2[v_orig_mapping_i[g]] for g in glyphOrder] v_orig_mapping = [mapping2[v_orig_mapping[g]] for g in glyphOrder]
use_direct = False use_direct = False
vOrigMapping = None vOrigMapping = None
@ -611,7 +598,7 @@ def _get_advance_metrics(font, masterModel, master_ttfs,
else: else:
metricsStore = indirectStore metricsStore = indirectStore
if v_orig_metricses: if v_orig_metricses:
vOrigMapping = builder.buildVarIdxMap(v_orig_mapping_i, glyphOrder) vOrigMapping = builder.buildVarIdxMap(v_orig_mapping, glyphOrder)
return metricsStore, advanceMapping, vOrigMapping return metricsStore, advanceMapping, vOrigMapping