python-fontbro 0.26.0__tar.gz → 0.27.0__tar.gz

{python_fontbro-0.26.0/python_fontbro.egg-info → python_fontbro-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fontbro
-Version: 0.26.0
+Version: 0.27.0
 Summary: friendly font operations on top of fontTools.
 Author-email: Fabio Caccamo <fabio.caccamo@gmail.com>
 Maintainer-email: Fabio Caccamo <fabio.caccamo@gmail.com>
@@ -57,7 +57,7 @@ License-File: LICENSE.txt
 Requires-Dist: fonttools[lxml,pathops,unicode,woff]<5.0,>=4.43.0
 Requires-Dist: imagehash<5.0.0,>=4.2.1
 Requires-Dist: opentype-sanitizer<10.0.0,>=9.1.0
-Requires-Dist: pillow<13.0.0,>=8.4.0
+Requires-Dist: pillow<13.0.0,>=12.2.0
 Requires-Dist: python-fsutil<1.0.0,>=0.16.0
 Dynamic: license-file
 

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/fontbro/font.py

@@ -8,7 +8,6 @@ import sys
 import tempfile
 from collections import Counter
 from collections.abc import Generator
-from curses import ascii
 from io import BytesIO
 from pathlib import Path
 from typing import IO, Any, cast
@@ -489,9 +488,13 @@ class Font:
         self,
     ) -> Font:
         """
-        Creates a new Font instance reading the same binary file.
+        Creates a new Font instance with the current in-memory state,
+        including any modifications made to the current instance.
         """
-        return Font(self._filepath or self._fileobject, **self._kwargs)
+        font = self.get_ttfont()
+        font_clone = Font(font, **self._kwargs)
+        font_clone._filepath = self._filepath
+        return font_clone
 
     def close(
         self,
@@ -550,7 +553,9 @@ class Font:
                 char = chr(code)
             else:
                 continue
-            if ascii.iscntrl(char):
+            # check if is control character
+            char_code = ord(char)
+            if char_code < 0x20 or char_code == 0x7F:
                 continue
             if glyfs and ignore_blank:
                 glyf = glyfs.get(char_name)
@@ -707,20 +712,23 @@ class Font:
     def get_filename(
         self,
         *,
-        variable_suffix: str = "Variable",
+        variable_suffix: str = "",
         variable_axes_tags: bool = True,
         variable_axes_values: bool = False,
     ) -> str:
         """
         Gets the filename to use for saving the font to file-system.
 
-        :param variable_suffix: The variable suffix, default "Variable"
+        :param variable_suffix: The variable suffix, default empty string (no suffix).
+            Suffixes like 'Variable' or 'VF' or any other are not recommended
+            per Google Fonts naming convention. Pass a custom suffix only if needed,
+            e.g. variable_suffix='Variable' -> 'FamilyName-Variable[wght].ttf'.
         :type variable_suffix: str
         :param variable_axes_tags: The variable axes tags flag,
-            if True, the axes tags will be appended, eg '[wght,wdth]'
+            if True, the axes tags will be appended, eg '[wdth,wght]'
         :type variable_axes_tags: bool
-        :param variable_axes_values: The variable axes values flag
-            if True, each axis values will be appended, eg '[wght(100,100,900),wdth(75,100,125)]'
+        :param variable_axes_values: The variable axes values flag,
+            if True, each axis values will be appended, eg '[wdth(75,100,125),wght(100,400,900)]'
         :type variable_axes_values: bool
 
         :returns: The filename.
@@ -742,7 +750,7 @@ class Font:
                     basename = f"{basename}-{variable_suffix}"
             # append axis tags stringified suffix, eg. [wdth,wght,slnt]
             if variable_axes_tags:
-                axes = self.get_variable_axes() or []
+                axes = self.get_variable_axes(sort=True) or []
                 axes_str_parts = []
                 for axis in axes:
                     axis_tag = axis["tag"]
@@ -1282,17 +1290,23 @@ class Font:
 
     def get_variable_axes(
         self,
+        *,
+        sort: bool = False,
     ) -> list[dict[str, Any]] | None:
         """
         Gets the font variable axes.
 
+        :param sort: If True, axes are sorted following the Google Fonts naming convention:
+            uppercase custom axes first, then lowercase standard axes, each group alphabetical.
+        :type sort: bool
+
         :returns: The list of axes if the font is a variable font otherwise None.
         :rtype: list of dict or None
         """
         if not self.is_variable():
             return None
         font = self.get_ttfont()
-        return [
+        axes = [
             {
                 "tag": axis.axisTag,
                 "name": self._VARIABLE_AXES_BY_TAG.get(axis.axisTag, {}).get(
@@ -1304,6 +1318,12 @@ class Font:
             }
             for axis in font["fvar"].axes
         ]
+        if sort:
+            axes = sorted(
+                axes,
+                key=lambda axis: (axis["tag"].islower(), axis["tag"]),
+            )
+        return axes
 
     def get_variable_axis_by_tag(
         self,
@@ -1759,7 +1779,7 @@ class Font:
     def _save_with_flavor(
         self,
         *,
-        flavor: str,
+        flavor: str | None,
         filepath: str | Path | None = None,
         overwrite: bool = True,
     ) -> str:
@@ -1776,6 +1796,30 @@ class Font:
         # return file path
         return saved_font_filepath
 
+    def save_as_ttf(
+        self,
+        filepath: str | Path | None = None,
+        *,
+        overwrite: bool = True,
+    ) -> str:
+        """
+        Saves font without web compression (woff/woff2 flavor is removed).
+        The resulting format will be ttf or otf depending on the source font.
+
+        :param filepath: The filepath
+        :type filepath: str or None
+        :param overwrite: The overwrite, if True the source font file can be overwritten
+        :type overwrite: bool
+
+        :returns: The filepath where the font has been saved to.
+        :rtype: str
+        """
+        return self._save_with_flavor(
+            flavor=None,
+            filepath=filepath,
+            overwrite=overwrite,
+        )
+
     def save_as_woff(
         self,
         filepath: str | Path | None = None,
@@ -1877,7 +1921,7 @@ class Font:
         fsutil.assert_not_file(dirpath)
         fsutil.make_dirs(dirpath)
 
-        instances_format = self.get_format()
+        instances_format = self.get_format(ignore_flavor=True)
         instances_saved = []
         instances = self.get_variable_instances() or []
         for instance in instances:
@@ -1896,7 +1940,7 @@ class Font:
                 Font.FORMAT_WOFF2: None,
                 Font.FORMAT_WOFF: None,
             }
-            instance_files[instances_format] = instance_font.save(
+            instance_files[instances_format] = instance_font.save_as_ttf(
                 dirpath,
                 overwrite=overwrite,
             )
@@ -2317,6 +2361,10 @@ class Font:
         # instantiate the static font
         instancer.instantiateVariableFont(font, coordinates, **options)
 
+        # remove STAT table
+        # not useful in static fonts and after instancing it may contain incorrect values
+        self._remove_stat_table()
+
         # update name records and style flags based on instance style name
         if instance and update_names:
             self.rename(
@@ -2331,6 +2379,19 @@ class Font:
             if has_italic or has_slant:
                 self.set_style_flags(regular=False, italic=True)
 
+    def _remove_stat_table(self) -> bool:
+        """
+        Removes the STAT table from the font.
+
+        :returns: True if the STAT table was removed, False if it was not present.
+        :rtype: bool
+        """
+        font = self.get_ttfont()
+        if "STAT" in font:
+            del font["STAT"]
+            return True
+        return False
+
     def __str__(
         self,
     ) -> str:

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/fontbro/metadata.py

@@ -4,4 +4,4 @@ __description__ = "friendly font operations on top of fontTools."
 __email__ = "fabio.caccamo@gmail.com"
 __license__ = "MIT"
 __title__ = "python-fontbro"
-__version__ = "0.26.0"
+__version__ = "0.27.0"

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/pyproject.toml

@@ -54,7 +54,7 @@ dependencies = [
     "fonttools[lxml,woff,unicode,pathops] >= 4.43.0, < 5.0",
     "imagehash >= 4.2.1, < 5.0.0",
     "opentype-sanitizer >= 9.1.0, < 10.0.0",
-    "pillow >= 8.4.0, < 13.0.0",
+    "pillow >= 12.2.0, < 13.0.0",
     "python-fsutil >= 0.16.0, < 1.0.0",
 ]
 dynamic = ["version"]

{python_fontbro-0.26.0 → python_fontbro-0.27.0/python_fontbro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fontbro
-Version: 0.26.0
+Version: 0.27.0
 Summary: friendly font operations on top of fontTools.
 Author-email: Fabio Caccamo <fabio.caccamo@gmail.com>
 Maintainer-email: Fabio Caccamo <fabio.caccamo@gmail.com>
@@ -57,7 +57,7 @@ License-File: LICENSE.txt
 Requires-Dist: fonttools[lxml,pathops,unicode,woff]<5.0,>=4.43.0
 Requires-Dist: imagehash<5.0.0,>=4.2.1
 Requires-Dist: opentype-sanitizer<10.0.0,>=9.1.0
-Requires-Dist: pillow<13.0.0,>=8.4.0
+Requires-Dist: pillow<13.0.0,>=12.2.0
 Requires-Dist: python-fsutil<1.0.0,>=0.16.0
 Dynamic: license-file
 

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/python_fontbro.egg-info/requires.txt

@@ -1,5 +1,5 @@
 fonttools[lxml,pathops,unicode,woff]<5.0,>=4.43.0
 imagehash<5.0.0,>=4.2.1
 opentype-sanitizer<10.0.0,>=9.1.0
-pillow<13.0.0,>=8.4.0
+pillow<13.0.0,>=12.2.0
 python-fsutil<1.0.0,>=0.16.0

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_clone.py

@@ -45,3 +45,18 @@ class CloneTestCase(AbstractTestCase):
         font_clone = font2.clone()
         self.assertFalse(font2 == font_clone)
         self.assertEqual(f"{font2}", f"{font_clone}")
+
+    def test_clone_preserves_in_memory_changes(self):
+        filepath = self._get_font_path("/Noto_Sans_TC/NotoSansTC-Regular.otf")
+        font = Font(filepath)
+        font.set_name(Font.NAME_FAMILY_NAME, "NotoSansTCCustom")
+        font_clone = font.clone()
+        self.assertEqual(
+            font_clone.get_name(Font.NAME_FAMILY_NAME),
+            font.get_name(Font.NAME_FAMILY_NAME),
+        )
+        self.assertEqual(
+            font_clone.get_name(Font.NAME_FAMILY_NAME),
+            "NotoSansTCCustom",
+        )
+        self.assertEqual(font_clone._filepath, filepath)

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_filename.py

@@ -23,28 +23,38 @@ class FilenameTestCase(AbstractTestCase):
         font = self._get_font("/Tourney/Tourney-Italic-VariableFont_wdth,wght.ttf")
         self.assertEqual(
             font.get_filename(),
-            "Tourney-Italic-Variable[wght,wdth].ttf",
+            "Tourney-Italic[wdth,wght].ttf",
         )
 
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
         self.assertEqual(
             font.get_filename(),
-            "Tourney-Variable[wght,wdth].ttf",
+            "Tourney[wdth,wght].ttf",
         )
 
         font = self._get_font("/Roboto_Mono/RobotoMono-Italic-VariableFont_wght.ttf")
         self.assertEqual(
             font.get_filename(),
-            "RobotoMono-Italic-Variable[wght].ttf",
+            "RobotoMono-Italic[wght].ttf",
         )
 
         font = self._get_font("/Roboto_Mono/RobotoMono-VariableFont_wght.ttf")
         self.assertEqual(
             font.get_filename(),
-            "RobotoMono-Variable[wght].ttf",
+            "RobotoMono[wght].ttf",
         )
 
     def test_get_filename_with_variable_font_and_custom_suffixes(self):
+        font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
+        self.assertEqual(
+            font.get_filename(
+                variable_suffix="Variable",
+                variable_axes_tags=False,
+                variable_axes_values=False,
+            ),
+            "Tourney-Variable.ttf",
+        )
+
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
         self.assertEqual(
             font.get_filename(
@@ -71,7 +81,7 @@ class FilenameTestCase(AbstractTestCase):
                 variable_suffix="VF",
                 variable_axes_tags=True,
             ),
-            "Tourney-VF[wght,wdth].ttf",
+            "Tourney-VF[wdth,wght].ttf",
         )
 
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
@@ -81,7 +91,7 @@ class FilenameTestCase(AbstractTestCase):
                 variable_axes_tags=True,
                 variable_axes_values=True,
             ),
-            "Tourney-VF[wght(100,100,900),wdth(75,100,125)].ttf",
+            "Tourney-VF[wdth(75,100,125),wght(100,100,900)].ttf",
         )
 
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
@@ -90,7 +100,7 @@ class FilenameTestCase(AbstractTestCase):
                 variable_suffix="",
                 variable_axes_tags=True,
             ),
-            "Tourney[wght,wdth].ttf",
+            "Tourney[wdth,wght].ttf",
         )
 
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")
@@ -100,7 +110,7 @@ class FilenameTestCase(AbstractTestCase):
                 variable_axes_tags=True,
                 variable_axes_values=True,
             ),
-            "Tourney[wght(100,100,900),wdth(75,100,125)].ttf",
+            "Tourney[wdth(75,100,125),wght(100,100,900)].ttf",
         )
 
         font = self._get_font("/Tourney/Tourney-VariableFont_wdth,wght.ttf")

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_instantiation.py

@@ -1,3 +1,4 @@
+from fontbro import Font
 from tests import AbstractTestCase
 
 
@@ -131,6 +132,20 @@ class InstantiationTestCase(AbstractTestCase):
         )
         self.assertFalse(font.get_style_flag("italic"))
 
+    def test_to_static_removes_stat_table(self):
+        font = self._get_variable_font()
+        self.assertIn("STAT", font.get_ttfont())
+        font.to_static(coordinates={"wght": 400, "wdth": 100})
+        self.assertNotIn("STAT", font.get_ttfont())
+
+    def test_to_static_stat_table_not_present_in_saved_file(self):
+        font = self._get_variable_font()
+        font.to_static(coordinates={"wght": 400, "wdth": 100})
+        output_filepath = self._get_font_temp_path("")
+        font_saved_filepath = font.save(output_filepath, overwrite=True)
+        font_saved = Font(font_saved_filepath)
+        self.assertNotIn("STAT", font_saved.get_ttfont())
+
     def test_to_sliced_variable_with_static_font(self):
         font = self._get_static_font()
         with self.assertRaises(TypeError):

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_sanitize.py

@@ -1,3 +1,5 @@
+import logging
+
 import fsutil
 
 from fontbro import Font
@@ -9,6 +11,21 @@ class SanitizeTestCase(AbstractTestCase):
     This class describes a sanitize test case.
     """
 
+    # fontTools uses log.error()/log.warning() when parsing malformed tables
+    # (e.g. "skipping malformed name record", "timestamp out of range").
+    # NullHandler prevents Python's lastResort from printing them to stderr.
+    _fonttools_null_handler = logging.NullHandler()
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        logging.getLogger("fontTools").addHandler(cls._fonttools_null_handler)
+
+    @classmethod
+    def tearDownClass(cls):
+        logging.getLogger("fontTools").removeHandler(cls._fonttools_null_handler)
+        super().tearDownClass()
+
     def _test_sanitize(
         self,
         dirpath,

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_save.py

@@ -191,3 +191,33 @@ class SaveTestCase(AbstractTestCase):
         output_dirpath = self._get_font_temp_path("")
         with self.assertRaises(TypeError):
             font.save_variable_instances(output_dirpath)
+
+    def test_save_as_ttf_from_woff(self):
+        # create woff2 on the fly
+        font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
+        woff_filepath = self._get_font_temp_path("RobotoMono-Regular.woff")
+        font.save_as_woff(woff_filepath, overwrite=True)
+        # create font instance from woff file
+        font_woff = Font(woff_filepath)
+        output_filepath = self._get_font_temp_path("")
+        font_saved_filepath = font_woff.save_as_ttf(output_filepath)
+        self.assertTrue(font_saved_filepath.endswith(".ttf"))
+        # ensure that the original font format is not changed
+        self.assertEqual(font_woff.get_format(), Font.FORMAT_WOFF)
+        font_saved = Font(font_saved_filepath)
+        self.assertEqual(font_saved.get_format(), Font.FORMAT_TTF)
+
+    def test_save_as_ttf_from_woff2(self):
+        # create woff2 on the fly
+        font = self._get_font("/Roboto_Mono/static/RobotoMono-Regular.ttf")
+        woff2_filepath = self._get_font_temp_path("RobotoMono-Regular.woff2")
+        font.save_as_woff2(woff2_filepath, overwrite=True)
+        # create font instance from woff2 file
+        font_woff2 = Font(woff2_filepath)
+        output_filepath = self._get_font_temp_path("")
+        font_saved_filepath = font_woff2.save_as_ttf(output_filepath)
+        self.assertTrue(font_saved_filepath.endswith(".ttf"))
+        # ensure that the original font format is not changed
+        self.assertEqual(font_woff2.get_format(), Font.FORMAT_WOFF2)
+        font_saved = Font(font_saved_filepath)
+        self.assertEqual(font_saved.get_format(), Font.FORMAT_TTF)

{python_fontbro-0.26.0 → python_fontbro-0.27.0}/tests/test_str.py

@@ -10,5 +10,5 @@ class StrTestCase(AbstractTestCase):
         filepath = "/Roboto_Mono/static/RobotoMono-Regular.ttf"
         font = self._get_font(filepath)
         s = str(font)
-        self.assertTrue(s.startswith("Font('"))
-        self.assertTrue(s.endswith(filepath + "')"))
+        expected = f"Font('{font._filepath}')"
+        self.assertEqual(s, expected)