From: Marc Foley Date: Fri, 1 Jul 2022 11:43:09 +0000 (+0100) Subject: make family_name optional X-Git-Tag: v0.3.5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dc3626904e4f6b5a15c684753efdbb608f5434c;p=thirdparty%2Fgoogle%2Ffonts.git make family_name optional --- diff --git a/Lib/axisregistry/__init__.py b/Lib/axisregistry/__init__.py index 3c4c3f0b92..f90a6b1064 100644 --- a/Lib/axisregistry/__init__.py +++ b/Lib/axisregistry/__init__.py @@ -275,8 +275,10 @@ def build_vf_name_table(ttFont, family_name, siblings=[]): build_variations_ps_name(ttFont, family_name) -def build_variations_ps_name(ttFont, family_name): +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( diff --git a/tests/test_names.py b/tests/test_names.py index 25cf933ceb..1a907967db 100644 --- a/tests/test_names.py +++ b/tests/test_names.py @@ -522,7 +522,6 @@ def test_fvar_instance_collisions(fp, sibling_fps, result): ) def test_build_variations_ps_name(fp, result): ttFont = TTFont(fp) - family_name = ttFont["name"].getBestFamilyName() - build_variations_ps_name(ttFont, family_name) + build_variations_ps_name(ttFont) variation_ps_name = ttFont["name"].getName(25, 3, 1, 0x409).toUnicode() assert variation_ps_name == result