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

[mvar] rename MVAR_entries -> MVAR_ENTRIES

Browse Source 
I like all-uppercase for global constants
This commit is contained in:
Cosimo Lupo 2017-10-22 12:19:24 +01:00
parent 28bb992c1f
commit 4bd57b9844
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,7 @@ from fontTools.ttLib.tables.TupleVariation import TupleVariation
from fontTools.ttLib.tables import otTables as ot
from fontTools.varLib import builder, designspace, models, varStore
from fontTools.varLib.merger import VariationMerger, _all_equal
from fontTools.varLib.mvar import MVAR_entries
from fontTools.varLib.mvar import MVAR_ENTRIES
from fontTools.varLib.iup import iup_delta_optimize
from collections import OrderedDict
import os.path
@ -438,7 +438,7 @@ def _add_MVAR(font, model, master_ttfs, axisTags):
lastTableTag = None
fontTable = None
tables = None
for tag, (tableTag, itemName) in sorted(MVAR_entries.items(), key=lambda kv: kv[1]):
for tag, (tableTag, itemName) in sorted(MVAR_ENTRIES.items(), key=lambda kv: kv[1]):
if tableTag != lastTableTag:
tables = fontTable = None
if tableTag in font:

6
Lib/fontTools/varLib/mutator.py
View File

@ -12,7 +12,7 @@ from fontTools.varLib import _GetCoordinates, _SetCoordinates, _DesignspaceAxis
from fontTools.varLib.models import supportScalar, normalizeLocation
from fontTools.varLib.merger import MutatorMerger
from fontTools.varLib.varStore import VarStoreInstancer
from fontTools.varLib.mvar import MVAR_entries
from fontTools.varLib.mvar import MVAR_ENTRIES
from fontTools.varLib.iup import iup_delta
import os.path
import logging
@ -96,9 +96,9 @@ def instantiateVariableFont(varfont, location, inplace=False):
records = mvar.ValueRecord
for rec in records:
mvarTag = rec.ValueTag
if mvarTag not in MVAR_entries:
if mvarTag not in MVAR_ENTRIES:
continue
tableTag, itemName = MVAR_entries[mvarTag]
tableTag, itemName = MVAR_ENTRIES[mvarTag]
delta = round(varStoreInstancer[rec.VarIdx])
if not delta:
continue

2
Lib/fontTools/varLib/mvar.py
View File

@ -2,7 +2,7 @@ from __future__ import print_function, division, absolute_import
from __future__ import unicode_literals
from fontTools.misc.py23 import *
MVAR_entries = {
MVAR_ENTRIES = {
'hasc': ('OS/2', 'sTypoAscender'), # horizontal ascender
'hdsc': ('OS/2', 'sTypoDescender'), # horizontal descender
'hlgp': ('OS/2', 'sTypoLineGap'), # horizontal line gap