Skip to content

Commit

Permalink
Merge pull request #52 from m4rc1e/nameid25
Browse files Browse the repository at this point in the history
Move nameid25 to its own func
  • Loading branch information
m4rc1e authored Jul 1, 2022
2 parents f2292c3 + 3dc3626 commit 1e0c409
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 1 deletion.
7 changes: 6 additions & 1 deletion Lib/axisregistry/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,13 @@ def build_vf_name_table(ttFont, family_name, siblings=[]):
build_static_name_table_v1(ttFont, family_name, style_name)
else:
build_static_name_table(ttFont, family_name, style_name)
build_variations_ps_name(ttFont, family_name)

# set nameID25.

def build_variations_ps_name(ttFont, family_name=None):
assert is_variable(ttFont), "Not a VF!"
if not family_name:
family_name = ttFont["name"].getBestFamilyName()
font_styles = axis_registry.fallbacks_in_name_table(ttFont)
if font_styles:
vf_ps = family_name.replace(" ", "") + "".join(
Expand Down
19 changes: 19 additions & 0 deletions tests/test_names.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
build_filename,
build_fvar_instances,
build_stat,
build_variations_ps_name,
_fvar_dflts,
_fvar_instance_collisions,
)
Expand Down Expand Up @@ -506,3 +507,21 @@ def test_fvar_instance_collisions(fp, sibling_fps, result):
ttFont = TTFont(fp)
siblings = [TTFont(fp) for fp in sibling_fps]
assert _fvar_instance_collisions(ttFont, siblings) == result


@pytest.mark.parametrize(
"fp, result",
[
(roboto_flex_fp, "RobotoFlex"),
(opensans_roman_fp, "OpenSans"),
(opensans_italic_fp, "OpenSansItalic"),
(opensans_cond_roman_fp, "OpenSansCondensed"),
(opensans_cond_italic_fp, "OpenSansCondensedItalic"),
(wonky_fp, "Wonky"),
],
)
def test_build_variations_ps_name(fp, result):
ttFont = TTFont(fp)
build_variations_ps_name(ttFont)
variation_ps_name = ttFont["name"].getName(25, 3, 1, 0x409).toUnicode()
assert variation_ps_name == result

0 comments on commit 1e0c409

Please sign in to comment.