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

[subset] PR feedback implementation

Browse Source
This commit is contained in:
Jack McCabe 2022-09-30 15:59:11 +01:00
parent 14ce08bd75
commit eeba234ee0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/fontTools/subset/__init__.py
View File

@ -2271,9 +2271,10 @@ def prune_post_subset(self, font, options):
name_table.names = [
n for n in name_table.names
if (
n.nameID not in dropped_labels or
n.nameID not in dropped_labels
# Only remove nameIDs in the user range and if they're not explicitly kept
n.nameID < 256 or n.nameID in options.name_IDs
or n.nameID < 256
or n.nameID in options.name_IDs
)
]
return bool(self.numPaletteEntries)

4
Tests/subset/subset_test.py
View File

@ -1268,7 +1268,6 @@ def colrv1_cpalv1_path(colrv1_path):
@pytest.fixture
def colrv1_cpalv1_share_nameID_path(colrv1_path):
# upgrade CPAL from v0 to v1 by adding labels
font = TTFont(colrv1_path)
fb = FontBuilder(font=font)
fb.setupCPAL(
@ -1392,6 +1391,8 @@ def test_subset_COLRv1_and_CPALv1(colrv1_cpalv1_path):
]
# check that the "first color" name is dropped from name table
font = TTFont(colrv1_cpalv1_path)
first_color_nameID = None
for n in font["name"].names:
if n.toUnicode() == "first color":
first_color_nameID = n.nameID
@ -1406,6 +1407,7 @@ def test_subset_COLRv1_and_CPALv1_keep_nameID(colrv1_cpalv1_path):
# figure out the name ID of first color so we can keep it
font = TTFont(colrv1_cpalv1_path)
first_color_nameID = None
for n in font["name"].names:
if n.toUnicode() == "first color":
first_color_nameID = n.nameID