foundrytools-cli 1.1.16__tar.gz → 1.1.18__tar.gz

{foundrytools_cli-1.1.16/foundrytools_cli.egg-info → foundrytools_cli-1.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.16
+Version: 1.1.18
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,14 +11,14 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.53.1
+Requires-Dist: fonttools>=4.54.0
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0
 Requires-Dist: dehinter>=4.0.0
 Requires-Dist: loguru>=0.7.2
-Requires-Dist: pathvalidate>=3.2.0
-Requires-Dist: rich>=13.7.1
+Requires-Dist: pathvalidate>=3.2.1
+Requires-Dist: rich>=13.8.1
 Requires-Dist: skia-pathops>=0.8.0.post1
 Requires-Dist: ttfautohint-py>=0.5.1
 Requires-Dist: zopfli>=0.2.3

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/foundryToolsCLI/CLI/ftcli_utils.py

@@ -5,6 +5,7 @@ from copy import deepcopy
 from pathlib import Path
 
 import click
+from afdko.fdkutils import run_shell_command
 from fontTools.misc.cliTools import makeOutputFileName
 from fontTools.ttLib import TTFont
 from pathvalidate import sanitize_filename, sanitize_filepath
@@ -254,8 +255,18 @@ def font_organizer(
               """,
 )
 @add_recursive_option()
+@click.option(
+    "-o",
+    "--overwrite",
+    "overwrite",
+    is_flag=True,
+    help="""
+        Allow overwriting output files. THIS MIGHT POTENTIALLY RESULT IN LOSS OF FILES.
+        USE WITH CARE. This might result in a loss of files.
+    """,
+)
 @Timer(logger=logger.info)
-def font_renamer(input_path: Path, source: str, recursive: bool = False):
+def font_renamer(input_path: Path, source: str, recursive: bool = False, overwrite: bool = False):
     """
     Rename font files according to the provided source string.
     """
@@ -283,7 +294,7 @@ def font_renamer(input_path: Path, source: str, recursive: bool = False):
                         new_file_name,
                         extension=new_file_extension,
                         outputDir=file.parent,
-                        overWrite=False,
+                        overWrite=overwrite,
                     )
                 )
                 file.rename(output_file)
@@ -347,6 +358,73 @@ def rebuild(
             font.close()
 
 
+@utils.command()
+@add_file_or_path_argument()
+@add_recursive_option()
+@add_common_options()
+@Timer(logger=logger.info)
+def remove_unreachable_glyphs(
+    input_path: Path,
+    recursive: bool = False,
+    output_dir: t.Optional[Path] = None,
+    recalc_timestamp: bool = False,
+    overwrite: bool = True,
+):
+    """
+    Subsets a font file by removing unreachable glyphs.
+    """
+
+    fonts = get_fonts_in_path(
+        input_path=input_path, recursive=recursive, recalc_timestamp=recalc_timestamp
+    )
+    if not initial_check_pass(fonts=fonts, output_dir=output_dir):
+        return
+
+    for font in fonts:
+        try:
+            in_file = Path(font.reader.file.name)
+            out_file = Path(makeOutputFileName(in_file, outputDir=output_dir, overWrite=overwrite))
+            logger.opt(colors=True).info(Logs.current_file, file=in_file)
+
+            command = [
+                "fonttools",
+                "subset",
+                in_file,
+                f"--output-file={out_file}",
+                "--unicodes=*",
+                "--notdef-glyph",
+                "--notdef-outline",
+                "--layout-features=*",
+                "--layout-scripts=*",
+                "--drop-tables=",
+                "--passthrough-tables",
+                "--legacy-kern",
+                "--name-IDs=*",
+                "--name-legacy",
+                "--name-languages=*",
+                "--glyph-names",
+                "--legacy-cmap",
+                "--symbol-cmap",
+                "--recalc-bounds",
+                "--recalc-average-width",
+                "--recalc-max-context",
+            ]
+
+            if recalc_timestamp:
+                command.append("--recalc-timestamp")
+            else:
+                command.append("--no-recalc-timestamp")
+
+            run_shell_command(command)
+
+            logger.success(Logs.file_saved, file=out_file)
+
+        except Exception as e:
+            logger.exception(e)
+        finally:
+            font.close()
+
+
 @utils.command()
 @add_file_or_path_argument()
 @click.option("-major", type=click.IntRange(0, 999), help="Major version")

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/foundryToolsCLI/Lib/Font.py

@@ -9,6 +9,7 @@ from cffsubr import subroutinize, desubroutinize
 from fontTools.misc.psCharStrings import T2CharString
 from fontTools.misc.timeTools import timestampToString
 from fontTools.pens.statisticsPen import StatisticsPen
+from fontTools.ttLib.tables._f_v_a_r import Axis
 from fontTools.ttLib.ttFont import TTFont
 
 from foundryToolsCLI.Lib.tables.OS_2 import TableOS2
@@ -623,6 +624,13 @@ class Font(TTFont):
             name.
         :return: A string representing the file name of the font.
         """
+        if self.is_variable:
+            family_name = self.guess_family_name().replace(" ", "").strip()
+            if self.is_italic:
+                family_name += "-Italic"
+            axes = self.get_axes()
+            file_name = f"{family_name}[{','.join([axis.axisTag for axis in axes])}]"
+            return file_name
 
         if self.is_ttf:
             if source in (4, 5):
@@ -644,6 +652,14 @@ class Font(TTFont):
         else:
             return Path(self.reader.file.name).stem
 
+    def get_axes(self) -> list[Axis]:
+        """
+        This function returns a list of axes in a variable font.
+        """
+        if not self.is_variable:
+            return []
+        return [axis for axis in self["fvar"].axes if axis.flags == 0]
+
     def fix_cff_top_dict_version(self) -> None:
         if not self.is_otf:
             return

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/foundryToolsCLI/Lib/VFont.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from fontTools.ttLib.tables._f_v_a_r import NamedInstance, Axis
+from fontTools.ttLib.tables._f_v_a_r import NamedInstance
 
 from foundryToolsCLI.Lib.Font import Font
 
@@ -10,9 +10,6 @@ class VariableFont(Font):
         super().__init__(file=file, recalcTimestamp=recalcTimestamp)
         assert "fvar" in self
 
-    def get_axes(self) -> list[Axis]:
-        return [axis for axis in self["fvar"].axes if axis.flags == 0]
-
     def get_instances(self) -> list[NamedInstance]:
         return [instance for instance in self["fvar"].instances]
 

foundrytools_cli-1.1.18/foundryToolsCLI/__init__.py

@@ -0,0 +1,3 @@
+VERSION = __version__ = "1.1.18"
+
+__all__ = ["VERSION"]

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.16
+Version: 1.1.18
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,14 +11,14 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.53.1
+Requires-Dist: fonttools>=4.54.0
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0
 Requires-Dist: dehinter>=4.0.0
 Requires-Dist: loguru>=0.7.2
-Requires-Dist: pathvalidate>=3.2.0
-Requires-Dist: rich>=13.7.1
+Requires-Dist: pathvalidate>=3.2.1
+Requires-Dist: rich>=13.8.1
 Requires-Dist: skia-pathops>=0.8.0.post1
 Requires-Dist: ttfautohint-py>=0.5.1
 Requires-Dist: zopfli>=0.2.3

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/foundrytools_cli.egg-info/requires.txt

@@ -1,12 +1,12 @@
 afdko>=4.0.1
-fonttools>=4.53.1
+fonttools>=4.54.0
 brotli>=1.1.0
 click>=8.1.7
 cffsubr>=0.3.0
 dehinter>=4.0.0
 loguru>=0.7.2
-pathvalidate>=3.2.0
-rich>=13.7.1
+pathvalidate>=3.2.1
+rich>=13.8.1
 skia-pathops>=0.8.0.post1
 ttfautohint-py>=0.5.1
 zopfli>=0.2.3

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/requirements.txt

@@ -1,13 +1,13 @@
 # Hard pinning here gets relaxed to ">=" in setup.py
 afdko==4.0.1
-fonttools==4.53.1
+fonttools==4.54.0
 brotli==1.1.0
 click==8.1.7
 cffsubr==0.3.0
 dehinter==4.0.0
 loguru==0.7.2
-pathvalidate==3.2.0
-rich==13.7.1
+pathvalidate==3.2.1
+rich==13.8.1
 skia-pathops==0.8.0.post1
 ttfautohint-py==0.5.1
 zopfli==0.2.3

{foundrytools_cli-1.1.16 → foundrytools_cli-1.1.18}/setup.py

@@ -18,7 +18,7 @@ def _get_requirements():
 
 setuptools.setup(
     name="foundrytools-cli",
-    version="1.1.16",
+    version="1.1.18",
     description="A set of command line tools to inspect, manipulate and convert font files",
     long_description=long_description,
     long_description_content_type="text/markdown",

foundrytools_cli-1.1.16/foundryToolsCLI/__init__.py

@@ -1,3 +0,0 @@
-VERSION = __version__ = "1.1.16"
-
-__all__ = ["VERSION"]