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

Newer black

Browse Source
This commit is contained in:
Behdad Esfahbod 2024-02-06 15:42:21 -07:00
parent 3bada5de80
commit a1641d91b2
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/fontTools/ttLib/tables/otConverters.py
View File

@ -1930,11 +1930,7 @@ class CFF2Index(BaseConverter):
offSize = ( offSize = (
1 1
if lastOffset < 0x100 if lastOffset < 0x100
else 2 else 2 if lastOffset < 0x10000 else 3 if lastOffset < 0x1000000 else 4
if lastOffset < 0x10000
else 3
if lastOffset < 0x1000000
else 4
) )
writer.writeUInt8(offSize) writer.writeUInt8(offSize)

8
Lib/fontTools/varLib/instancer/__init__.py
View File

@ -928,9 +928,11 @@ def instantiateGvar(varfont, axisLimits, optimize=True):
glyphnames = sorted( glyphnames = sorted(
glyf.glyphOrder, glyf.glyphOrder,
key=lambda name: ( key=lambda name: (
glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth (
if glyf[name].isComposite() glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth
else 0, if glyf[name].isComposite()
else 0
),
name, name,
), ),
) )

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

@ -199,9 +199,11 @@ def instantiateVariableFont(varfont, location, inplace=False, overlap=True):
glyphnames = sorted( glyphnames = sorted(
gvar.variations.keys(), gvar.variations.keys(),
key=lambda name: ( key=lambda name: (
glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth (
if glyf[name].isComposite() glyf[name].getCompositeMaxpValues(glyf).maxComponentDepth
else 0, if glyf[name].isComposite()
else 0
),
name, name,
), ),
) )
@ -305,9 +307,9 @@ def instantiateVariableFont(varfont, location, inplace=False, overlap=True):
if applies: if applies:
assert record.FeatureTableSubstitution.Version == 0x00010000 assert record.FeatureTableSubstitution.Version == 0x00010000
for rec in record.FeatureTableSubstitution.SubstitutionRecord: for rec in record.FeatureTableSubstitution.SubstitutionRecord:
table.FeatureList.FeatureRecord[ table.FeatureList.FeatureRecord[rec.FeatureIndex].Feature = (
rec.FeatureIndex rec.Feature
].Feature = rec.Feature )
break break
del table.FeatureVariations del table.FeatureVariations