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

[varLib] use magic -0x8000 to ignore post.underline* for MVAR

Browse Source 
googlei18n/ufo2ft#308 (comment)
googlei18n/ufo2ft#310
This commit is contained in:
Cosimo Lupo 2019-01-15 18:19:19 +00:00
parent 7d947c9fd8
commit 93e791ab24
No known key found for this signature in database
GPG Key ID: 59D54DB0C9976482
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,10 +516,10 @@ def _add_MVAR(font, masterModel, master_ttfs, axisTags):
# and unilaterally/arbitrarily define a sentinel value to distinguish the case # and unilaterally/arbitrarily define a sentinel value to distinguish the case
# when a post table is present in a given master simply because that's where # when a post table is present in a given master simply because that's where
# the glyph names in TrueType must be stored, but the underline values are not # the glyph names in TrueType must be stored, but the underline values are not
# meant to be used for building MVAR's deltas. The value of 0x8000 (-36768) # meant to be used for building MVAR's deltas. The value of -0x8000 (-36768)
# the minimum FWord (int16) value, was chosen for its unlikelyhood to appear # the minimum FWord (int16) value, was chosen for its unlikelyhood to appear
# in real-world underline position/thickness values. # in real-world underline position/thickness values.
specialTags = {"unds": 0x8000, "undo": 0x8000} specialTags = {"unds": -0x8000, "undo": -0x8000}
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: if tableTag != lastTableTag:
tables = fontTable = None tables = fontTable = None
@ -527,16 +527,13 @@ def _add_MVAR(font, masterModel, master_ttfs, axisTags):
fontTable = font[tableTag] fontTable = font[tableTag]
tables = [] tables = []
for master in master_ttfs: for master in master_ttfs:
if tableTag in master: if tableTag not in master or (
if ( tag in specialTags
tag in specialTags and getattr(master[tableTag], itemName) == specialTags[tag]
and getattr(master[tableTag], itemName) == specialTags[tag] ):
):
tables.append(None)
else:
tables.append(master[tableTag])
else:
tables.append(None) tables.append(None)
else:
tables.append(master[tableTag])
lastTableTag = tableTag lastTableTag = tableTag
if tables is None: if tables is None:
continue continue