foundrytools-cli 2.0.4__tar.gz → 2.1.0__tar.gz

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foundrytools-cli
-Version: 2.0.4
+Version: 2.1.0
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Author: Cesare Gilento
 Author-email: Cesare Gilento <ftcli@proton.me>
@@ -11,22 +11,22 @@ Classifier: Intended Audience :: End Users/Desktop
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Text Processing :: Fonts
-Requires-Dist: afdko>=4.0.2
-Requires-Dist: click>=8.1.8
-Requires-Dist: foundrytools>=0.1.4
+Requires-Dist: afdko>=4.0.3
+Requires-Dist: click>=8.3.1
+Requires-Dist: foundrytools>=0.1.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: pathvalidate>=3.3.1
-Requires-Dist: rich>=14.1.0
+Requires-Dist: rich>=14.3.0
 Requires-Dist: ufolib2>=0.18.1
 Requires-Dist: win32-setctime>=1.2.0 ; sys_platform >= 'win32'
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Project-URL: Homepage, https://github.com/ftCLI/FoundryTools-CLI
 Description-Content-Type: text/markdown
 
@@ -54,7 +54,7 @@ rendered by [rich](https://github.com/Textualize/rich).
 
 ## Installation
 
-FoundryTools-CLI requires Python 3.9 or later.
+FoundryTools-CLI requires Python 3.10 or later.
 
 **IMPORTANT**: If you have Python 2.x installed in your system, you may have to use `python3`
 (instead of `python`) in the commands below.
@@ -96,7 +96,7 @@ python -m pip install -e .
 
 FoundryTools-CLI is a Terminal app where commands are logically organized into subcommands.
 
-Please refer to the [user documentation](https://foundrytools-cli.readthedocs.io/).
+Please refer to the [user documentation](https://foundrytools-cli.readthedocs.io/en/stable/).
 
 ## License
 

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/README.md

@@ -22,7 +22,7 @@ rendered by [rich](https://github.com/Textualize/rich).
 
 ## Installation
 
-FoundryTools-CLI requires Python 3.9 or later.
+FoundryTools-CLI requires Python 3.10 or later.
 
 **IMPORTANT**: If you have Python 2.x installed in your system, you may have to use `python3`
 (instead of `python`) in the commands below.
@@ -64,7 +64,7 @@ python -m pip install -e .
 
 FoundryTools-CLI is a Terminal app where commands are logically organized into subcommands.
 
-Please refer to the [user documentation](https://foundrytools-cli.readthedocs.io/).
+Please refer to the [user documentation](https://foundrytools-cli.readthedocs.io/en/stable/).
 
 ## License
 

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/pyproject.toml

@@ -1,14 +1,14 @@
 [build-system]
-requires = ["uv_build>=0.8.13"]
+requires = ["uv_build>=0.9.17"]
 build-backend = "uv_build"
 
 [project]
 name = "foundrytools-cli"
-version = "2.0.4"
+version = "2.1.0"
 description = "A set of command line tools to inspect, manipulate and convert font files"
 readme = "README.md"
 license = "MIT"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 authors = [
     { name = "Cesare Gilento", email = "ftcli@proton.me" },
 ]
@@ -20,36 +20,36 @@ classifiers = [
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "License :: OSI Approved :: MIT License",
     "Topic :: Text Processing :: Fonts",
 ]
 
 dependencies = [
-    "afdko>=4.0.2",
-    "click>=8.1.8",
-    "foundrytools>=0.1.4",
+    "afdko>=4.0.3",
+    "click>=8.3.1",
+    "foundrytools>=0.1.6",
     "loguru>=0.7.3",
     "pathvalidate>=3.3.1",
-    "rich>=14.1.0",
+    "rich>=14.3.0",
     "ufolib2>=0.18.1",
     "win32-setctime>=1.2.0; sys_platform >= 'win32'",
 ]
 
-[dependencies-groups]
+[dependency-groups]
 dev = [
-    "bump-my-version>=1.2.1",
-    "mypy>=1.17.1",
-    "pre-commit>=4.2.0",
-    "pylint>=3.3.8",
+    "bump-my-version>=1.2.6",
+    "mypy>=1.19.1",
+    "pre-commit>=4.5.1",
+    "pylint>=4.0.4",
 ]
 docs = [
-    "sphinx-click>=6.0.0",
-    "sphinx-rtd-theme>=3.0.2",
+    "sphinx-click>=6.2.0",
+    "sphinx-rtd-theme>=3.1.0",
 ]
 
 [project.scripts]
@@ -58,22 +58,10 @@ ftcli = "foundrytools_cli.__main__:cli"
 [project.urls]
 Homepage = "https://github.com/ftCLI/FoundryTools-CLI"
 
-[tool.hatch.version]
-path = "src/foundrytools_cli/__init__.py"
-pattern = 'VERSION = __version__ = "(?P<version>[^"]+)"'
-
-[tool.hatch.build.targets.sdist]
-include = [
-    "/src",
-]
-exclude = [
-    "/.gitignore",
-]
-
 [tool.bumpversion]
-current_version = "2.0.4"
-commit = true
-tag = true
+current_version = "2.1.0"
+commit = false
+tag = false
 
 [[tool.bumpversion.files]]
 filename = "src/foundrytools_cli/__init__.py"

foundrytools_cli-2.1.0/src/foundrytools_cli/__init__.py

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

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/cff.py

@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 import click
 from foundrytools import Font

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/converter/cli.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Literal, Optional
+from typing import Any, Literal
 
 import click
 from fontTools.misc.cliTools import makeOutputFileName
@@ -74,8 +74,8 @@ def otf_to_ttf(input_path: Path, **options: dict[str, Any]) -> None:
     def task(
         font: Font,
         tolerance: float = 1.0,
-        target_upm: Optional[int] = None,
-        output_dir: Optional[Path] = None,
+        target_upm: int | None = None,
+        output_dir: Path | None = None,
         overwrite: bool = True,
     ) -> None:
         flavor = font.ttfont.flavor
@@ -142,7 +142,7 @@ def otf_to_ttf(input_path: Path, **options: dict[str, Any]) -> None:
     """,
 )
 @click.option(
-    "-cc/--no-cc",
+    "-cc/-no-cc",
     "--correct-contours/--no-correct-contours",
     is_flag=True,
     default=True,
@@ -201,7 +201,7 @@ def ttf_to_otf(input_path: Path, **options: dict[str, Any]) -> None:
 )
 def web_to_sfnt(
     input_path: Path,
-    in_format: Optional[Literal["woff", "woff2"]],
+    in_format: Literal["woff", "woff2"] | None,
     **options: dict[str, Any],
 ) -> None:
     """
@@ -236,8 +236,8 @@ def sfnt_to_web(input_path: Path, **options: dict[str, Any]) -> None:
 
     def task(
         font: Font,
-        output_dir: Optional[Path] = None,
-        out_format: Optional[Literal["woff", "woff2"]] = None,
+        output_dir: Path | None = None,
+        out_format: Literal["woff", "woff2"] | None = None,
         overwrite: bool = True,
         reorder_tables: bool = False,
     ) -> None:
@@ -302,7 +302,7 @@ def variable_to_static(input_path: Path, **options: dict[str, Any]) -> None:
         var_font: Font,
         select_instance: bool = False,
         overlap: int = 1,
-        output_dir: Optional[Path] = None,
+        output_dir: Path | None = None,
         overwrite: bool = True,
     ) -> None:
         if select_instance:

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/converter/ttf_to_otf.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 from afdko.fdkutils import run_shell_command
 from foundrytools import Font
@@ -10,7 +9,7 @@ from foundrytools.lib.qu2cu import quadratics_to_cubics_2
 from foundrytools_cli.utils.logger import logger
 
 
-def _build_out_file_name(font: Font, output_dir: Optional[Path], overwrite: bool = True) -> Path:
+def _build_out_file_name(font: Font, output_dir: Path | None, overwrite: bool = True) -> Path:
     """
     When converting a TrueType flavored web font to PS flavored web font, we need to add a suffix to
     the output file name to avoid overwriting the input file. This function builds the output file
@@ -39,11 +38,11 @@ def _build_out_file_name(font: Font, output_dir: Optional[Path], overwrite: bool
 def ttf2otf(
     font: Font,
     tolerance: float = 1.0,
-    target_upm: Optional[int] = None,
+    target_upm: int | None = None,
     correct_contours: bool = True,
     check_outlines: bool = False,
     subroutinize: bool = True,
-    output_dir: Optional[Path] = None,
+    output_dir: Path | None = None,
     overwrite: bool = True,
 ) -> None:
     """
@@ -104,11 +103,11 @@ def ttf2otf(
 
 def ttf2otf_with_tx(
     font: Font,
-    target_upm: Optional[int] = None,
+    target_upm: int | None = None,
     correct_contours: bool = True,
     check_outlines: bool = False,
     subroutinize: bool = True,
-    output_dir: Optional[Path] = None,
+    output_dir: Path | None = None,
     recalc_timestamp: bool = False,
     overwrite: bool = True,
 ) -> None:

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/fix/cli.py

@@ -344,6 +344,39 @@ def fix_monospace(input_path: Path, **options: dict[str, Any]) -> None:
     runner.run()
 
 
+@cli.command("integer-ppem-if-hinted", cls=BaseCommand)
+def fix_integer_ppm_if_hinted(input_path: Path, **options: dict[str, Any]) -> None:
+    """
+    Sets the ``head.flags`` bit 3 to force integer ppem for hinted fonts.
+
+    fontbakery check id: com.google.fonts/check/integer_ppem_if_hinted
+
+    Rationale:
+
+    Hinted fonts must have head table flag bit 3 set.
+
+    Per https://docs.microsoft.com/en-us/typography/opentype/spec/head, bit 3 of Head::flags decides
+    whether PPEM should be rounded. This bit should always be set for hinted fonts.
+
+    Note:
+    Bit 3 = Force ppem to integer values for all internal scaler math;
+
+    Fixing procedure:
+
+    * Check if the font is hinted by looking for the presence of the ``fpgm`` table.
+    * Set the ``head.flags`` bit 3 to force integer ppem for hinted fonts.
+    """
+
+    def task(font: Font) -> bool:
+        if font.ttfont.get("fpgm"):
+            font.t_head.set_bit("flags", 3, True)
+        return font.t_head.is_modified
+
+    runner = TaskRunner(input_path=input_path, task=task, **options)
+    runner.filter.filter_out_ps = True
+    runner.run()
+
+
 @cli.command("transformed-components", cls=BaseCommand)
 def fix_transformed_components(input_path: Path, **options: dict[str, Any]) -> None:
     """

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/font.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Literal, Optional
+from typing import Any, Literal
 
 import click
 from foundrytools.core.font import Font
@@ -150,8 +150,8 @@ def remove_glyphs(input_path: Path, **options: dict[str, Any]) -> None:
 
     def task(
         font: Font,
-        glyph_names_to_remove: Optional[set[str]],
-        glyph_ids_to_remove: Optional[set[int]],
+        glyph_names_to_remove: set[str] | None,
+        glyph_ids_to_remove: set[int] | None,
     ) -> bool:
         removed_glyphs = font.remove_glyphs(
             glyph_names_to_remove=glyph_names_to_remove,

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/hhea.py

@@ -50,7 +50,9 @@ def recalc_caret_offset(input_path: Path, **options: dict[str, Any]) -> None:
             source_file = font.file
         else:
             font.ttfont.flavor = None
-            source_file = font.temp_file
+            temp_file = get_temp_file_path()
+            font.save(temp_file)
+            source_file = temp_file
             font.save(source_file)
 
         command_1 = ["tx", "-t1", source_file, temp_t1_file]

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/name.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import click
 from foundrytools import Font
@@ -55,8 +55,8 @@ def del_names(input_path: Path, **options: dict[str, Any]) -> None:
     def task(
         font: Font,
         name_ids_to_process: tuple[int],
-        platform_id: Optional[int] = None,
-        language_string: Optional[str] = None,
+        platform_id: int | None = None,
+        language_string: str | None = None,
     ) -> bool:
         font.t_name.remove_names(
             name_ids=name_ids_to_process, platform_id=platform_id, language_string=language_string
@@ -171,8 +171,8 @@ def find_replace(input_path: Path, **options: dict[str, Any]) -> None:
         font: Font,
         old_string: str,
         new_string: str,
-        name_ids_to_process: Optional[tuple[int]] = None,
-        name_ids_to_skip: Optional[tuple[int]] = None,
+        name_ids_to_process: tuple[int] | None = None,
+        name_ids_to_skip: tuple[int] | None = None,
     ) -> bool:
         font.t_name.find_replace(
             old_string=old_string,
@@ -227,7 +227,7 @@ def set_name(input_path: Path, **options: dict[str, Any]) -> None:
         font: Font,
         name_id: int,
         name_string: str,
-        platform_id: Optional[int] = None,
+        platform_id: int | None = None,
         language_string: str = "en",
     ) -> bool:
         font.t_name.set_name(
@@ -289,7 +289,7 @@ def build_unique_id(input_path: Path, **options: dict[str, Any]) -> None:
     ``Font Revision;Vendor ID;PostScript Name``
     """
 
-    def task(font: Font, platform_id: Optional[int] = None, alternate: bool = False) -> bool:
+    def task(font: Font, platform_id: int | None = None, alternate: bool = False) -> bool:
         font.t_name.build_unique_identifier(platform_id=platform_id, alternate=alternate)
         return font.t_name.is_modified
 
@@ -313,7 +313,7 @@ def build_full_name(input_path: Path, **options: dict[str, Any]) -> None:
     Builds the NameID 4 (Full Font Name).
     """
 
-    def task(font: Font, platform_id: Optional[int] = None) -> bool:
+    def task(font: Font, platform_id: int | None = None) -> bool:
         font.t_name.build_full_font_name(platform_id=platform_id)
         return font.t_name.is_modified
 
@@ -337,7 +337,7 @@ def build_version_string(input_path: Path, **options: dict[str, Any]) -> None:
     Builds the NameID 5 (Version String).
     """
 
-    def task(font: Font, platform_id: Optional[int] = None) -> bool:
+    def task(font: Font, platform_id: int | None = None) -> bool:
         font.t_name.build_version_string(platform_id=platform_id)
         return font.t_name.is_modified
 
@@ -361,7 +361,7 @@ def build_postscript_name(input_path: Path, **options: dict[str, Any]) -> None:
     Builds the NameID 6 (PostScript Name).
     """
 
-    def task(font: Font, platform_id: Optional[int] = None) -> bool:
+    def task(font: Font, platform_id: int | None = None) -> bool:
         font.t_name.build_postscript_name(platform_id=platform_id)
         return font.t_name.is_modified
 

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/os_2.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Optional, Union
+from typing import Any
 
 import click
 from fontTools.misc.roundTools import otRound
@@ -257,7 +257,7 @@ def set_attrs(input_path: Path, **options: dict[str, Any]) -> None:
     """
     ensure_at_least_one_param(click.get_current_context())
 
-    def task(font: Font, **kwargs: dict[str, Optional[Union[int, float, str, bool]]]) -> bool:
+    def task(font: Font, **kwargs: dict[str, int | float | str | bool | None]) -> bool:
         for attr, value in kwargs.items():
             if value is not None:
                 try:
@@ -417,7 +417,7 @@ def set_fs_selection(input_path: Path, **options: dict[str, Any]) -> None:
     """
     ensure_at_least_one_param(click.get_current_context())
 
-    def task(font: Font, **kwargs: dict[str, Optional[bool]]) -> bool:
+    def task(font: Font, **kwargs: dict[str, bool | None]) -> bool:
         for attr, value in kwargs.items():
             if value is not None:
                 if hasattr(font.flags, attr):
@@ -497,7 +497,7 @@ def set_fs_type(input_path: Path, **options: dict[str, Any]) -> None:
     """
     ensure_at_least_one_param(click.get_current_context())
 
-    def task(font: Font, **kwargs: dict[str, Optional[bool]]) -> bool:
+    def task(font: Font, **kwargs: dict[str, bool | None]) -> bool:
         for attr, value in kwargs.items():
             if hasattr(font.t_os_2, attr) and value is not None:
                 setattr(font.t_os_2, attr, value)

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/otf.py

@@ -1,8 +1,10 @@
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, cast
+from typing import Any, cast
 
 import click
 from foundrytools import Font
+from foundrytools.app.otf_autohint import OTFAutohintError
 from foundrytools.app.otf_autohint import run as otf_autohint
 from foundrytools.app.otf_check_outlines import run as otf_check_outlines
 from foundrytools.app.otf_dehint import run as otf_dehint
@@ -57,8 +59,8 @@ def subroutinize_flag() -> Callable:
     """,
 )
 @click.option(
-    "-d",
-    "--decimal",
+    "-d/-no-d",
+    "--decimal/--no-decimal",
     "roundCoords",
     is_flag=True,
     default=True,
@@ -94,7 +96,12 @@ def autohint(input_path: Path, **options: dict[str, Any]) -> None:
 
     def task(font: Font, subroutinize: bool = True, **kwargs: dict[str, Any]) -> bool:
         logger.info("Autohinting...")
-        otf_autohint(font, **kwargs)
+
+        try:
+            otf_autohint(font, **kwargs)
+        except OTFAutohintError as e:
+            logger.error(f"Autohinting failed: {e}")
+            return False
 
         if subroutinize:
             font.reload()  # DO NOT REMOVE
@@ -269,8 +276,9 @@ def recalc_stems(input_path: Path, **options: dict[str, Any]) -> None:
         temp_file = get_temp_file_path()
         if flavor is not None:
             font.ttfont.flavor = None
-            font.save(font.temp_file)
-            input_file = font.temp_file
+            temp_file = get_temp_file_path()
+            font.save(temp_file)
+            input_file = temp_file
         else:
             input_file = font.file
 

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/post.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 
 import click
 from foundrytools import Font
@@ -43,10 +43,10 @@ def cli(input_path: Path, **options: dict[str, Any]) -> None:
 
     def task(
         font: Font,
-        italic_angle: Optional[float] = None,
-        underline_position: Optional[int] = None,
-        underline_thickness: Optional[int] = None,
-        fixed_pitch: Optional[bool] = None,
+        italic_angle: float | None = None,
+        underline_position: int | None = None,
+        underline_thickness: int | None = None,
+        fixed_pitch: bool | None = None,
     ) -> bool:
         attrs = {
             "italic_angle": italic_angle,

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/print/cli.py

@@ -1,5 +1,4 @@
 from pathlib import Path
-from typing import Optional
 
 import click
 from foundrytools import FontFinder
@@ -53,7 +52,7 @@ def font_info(input_path: Path) -> None:
     Prints a minimal set of NameRecords, omitting the ones with nameID not in 1, 2, 3, 4, 5, 6, 16,
     17, 18, 21, 22, 25""",
 )
-def font_names(input_path: Path, max_lines: Optional[int] = None, minimal: bool = False) -> None:
+def font_names(input_path: Path, max_lines: int | None = None, minimal: bool = False) -> None:
     """
     Prints the name table.
     """

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/print/font_names.py

@@ -1,5 +1,4 @@
 from shutil import get_terminal_size
-from typing import Optional
 
 from fontTools.ttLib.tables._n_a_m_e import _MAC_LANGUAGES, _WINDOWS_LANGUAGES, NameRecord
 from foundrytools import Font
@@ -42,7 +41,7 @@ JUSTIFY = 22
 
 
 def _process_name_table(
-    font: Font, table: Table, terminal_width: int, max_lines: Optional[int], minimal: bool
+    font: Font, table: Table, terminal_width: int, max_lines: int | None, minimal: bool
 ) -> None:
     name_table = NameTable(font.ttfont)
     names = name_table.table.names
@@ -63,7 +62,7 @@ def _process_name_table(
 
 
 def _add_name_row_to_table(
-    table: Table, name: NameRecord, terminal_width: int, max_lines: Optional[int]
+    table: Table, name: NameRecord, terminal_width: int, max_lines: int | None
 ) -> None:
     row_string = _get_name_row(name)
     row_string = wrap_string(
@@ -77,7 +76,7 @@ def _add_name_row_to_table(
 
 
 def _process_cff_table(
-    font: Font, table: Table, terminal_width: int, max_lines: Optional[int], minimal: bool
+    font: Font, table: Table, terminal_width: int, max_lines: int | None, minimal: bool
 ) -> None:
     if not font.is_ps:
         return
@@ -133,7 +132,7 @@ def _get_name_row(name: NameRecord) -> str:
     )
 
 
-def main(font: Font, max_lines: Optional[int] = None, minimal: bool = False) -> None:
+def main(font: Font, max_lines: int | None = None, minimal: bool = False) -> None:
     """
     Prints the names of the font.
     """

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/utils/cli.py

@@ -1,6 +1,7 @@
 # pylint: disable=import-outside-toplevel
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, cast
+from typing import Any, cast
 
 import click
 
@@ -38,7 +39,7 @@ cli = click.Group(help="Miscellaneous utilities.")
 @click.option(
     "-s",
     "--source",
-    type=click.Choice(choices=["1", "2", "3", "4", "5"]),
+    type=click.Choice(choices=["1", "2", "3", "4", "5", "6"]),
     default="1",
     callback=choice_to_int_callback,
     help="""
@@ -52,6 +53,7 @@ cli = click.Group(help="Miscellaneous utilities.")
         3: Full Font Name
         4: CFF fontNames (CFF fonts only)
         5: CFF TopDict FullName (CFF fonts only)
+        6: Macintosh LWFN (LaserWriter Font Naming) using 5:3:3 rule
         """,
 )
 @click.option(

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/commands/utils/font_renamer.py

@@ -1,3 +1,5 @@
+# ruff: noqa: C901
+import re
 from pathlib import Path
 
 from foundrytools import Font
@@ -6,6 +8,59 @@ from pathvalidate import sanitize_filename
 from foundrytools_cli.utils.logger import logger
 
 
+def _apply_533_rule(postscript_name: str) -> str:
+    """
+    Apply the Macintosh LaserWriter Font Naming (LWFN) 5:3:3 rule.
+
+    The rule divides the font name into "words" where each uppercase letter begins
+    a new word. The file name is derived by:
+    - Taking the initial uppercase letter and up to 4 lowercase letters in the first word
+    - Taking the initial uppercase letter and up to 2 lowercase letters for subsequent words
+    - Dropping hyphens between family and style portions
+
+    Args:
+        postscript_name: The PostScript name (e.g., "Helvetica-BoldOblique")
+
+    Returns:
+        The abbreviated filename following the 5:3:3 rule (e.g., "HelveBolObl")
+
+    Examples:
+        >>> _apply_533_rule("Helvetica-BoldOblique")
+        'HelveBolObl'
+        >>> _apply_533_rule("AGaramond-Bold")
+        'AGarBol'
+        >>> _apply_533_rule("Palatino-Roman")
+        'PalatRom'
+        >>> _apply_533_rule("Optima")
+        'Optim'
+    """
+    # Remove hyphens to get a continuous string
+    name_without_hyphens = postscript_name.replace("-", "")
+
+    # Split into words where each uppercase letter begins a new word
+    # This regex finds: uppercase letter followed by any number of lowercase letters
+    words = re.findall(r"[A-Z][a-z]*", name_without_hyphens)
+
+    if not words:
+        # Fallback for invalid/unusual PostScript names without uppercase letters.
+        # PostScript font names should start with uppercase per Adobe spec, but we handle
+        # the edge case gracefully. The 11-char limit approximates typical LWFN length
+        # (5+3+3 for a three-word name like FamilyStyleVariant).
+        MAX_FALLBACK_LENGTH = 11
+        return name_without_hyphens[:MAX_FALLBACK_LENGTH]
+
+    result = []
+    for i, word in enumerate(words):
+        if i == 0:
+            # First word: take up to 5 characters (1 uppercase + 4 lowercase)
+            result.append(word[:5])
+        else:
+            # Subsequent words: take up to 3 characters (1 uppercase + 2 lowercase)
+            result.append(word[:3])
+
+    return "".join(result)
+
+
 def _get_file_stem(font: Font, source: int = 1) -> str:
     """
     Get the best file name for a font.
@@ -20,6 +75,7 @@ def _get_file_stem(font: Font, source: int = 1) -> str:
             3: Full Font Name
             4: CFF fontNames (CFF fonts only)
             5: CFF TopDict FullName (CFF fonts only)
+            6: Macintosh LWFN (LaserWriter Font Naming) using 5:3:3 rule
 
     Returns:
         A sanitized file name for the font.
@@ -49,6 +105,12 @@ def _get_file_stem(font: Font, source: int = 1) -> str:
         file_name = font.t_cff_.table.cff.fontNames[0]
     elif source == 5 and font.is_ps:
         file_name = font.t_cff_.top_dict.FullName
+    elif source == 6:
+        # Build name from family and subfamily for LWFN 5:3:3 rule
+        family_name = str(font.t_name.table.getBestFamilyName())
+        subfamily_name = str(font.t_name.table.getBestSubFamilyName())
+        font_name = f"{family_name}-{subfamily_name}".replace(" ", "").replace(".", "")
+        file_name = _apply_533_rule(font_name)
     else:
         raise ValueError("Invalid source value.")
     return sanitize_filename(file_name, platform="auto")

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/utils/__init__.py

@@ -1,7 +1,8 @@
 import os
+from collections.abc import Callable
 from pathlib import Path
 from textwrap import TextWrapper
-from typing import Any, Callable, Optional, Union
+from typing import Any
 
 import click
 
@@ -41,7 +42,7 @@ class BaseCommand(click.Command):
                 """,
             ),
             click.Option(
-                ["-no-ow", "--no-overwrite", "overwrite"],
+                ["-ow/-no-ow", "--overwrite/--no-overwrite"],
                 is_flag=True,
                 default=True,
                 help="""
@@ -54,7 +55,7 @@ class BaseCommand(click.Command):
                 """,
             ),
             click.Option(
-                ["-no-rbb", "--no-recalc-bboxes", "recalc_bboxes"],
+                ["-rbb/-no-rbb", "--recalc-bboxes/--no-recalc-bboxes"],
                 is_flag=True,
                 default=True,
                 help="""
@@ -66,7 +67,7 @@ class BaseCommand(click.Command):
                 """,
             ),
             click.Option(
-                ["-rtb", "--reorder-tables", "reorder_tables"],
+                ["-rtb", "--reorder-tables"],
                 is_flag=True,
                 default=False,
                 help="""
@@ -112,8 +113,8 @@ def make_options(options: list[Callable]) -> Callable:
 
 
 def choice_to_int_callback(
-    ctx: click.Context, _: click.Parameter, value: Union[str, tuple[str, ...]]
-) -> Optional[Union[int, tuple[int, ...]]]:
+    ctx: click.Context, _: click.Parameter, value: str | tuple[str, ...]
+) -> int | tuple[int, ...] | None:
     """
     Callback for click options that accept a choice. Converts the choice to an integer or a tuple
     of integers.
@@ -129,7 +130,7 @@ def choice_to_int_callback(
     :param value: The value to convert
     :type value: Union[str, tuple[str, ...]]
     :return: The converted value
-    :rtype: Optional[Union[int, tuple[int, ...]]]
+    :rtype: int | tuple[int, ...] | None
     """
 
     # we do not check if the values can be converted to integers here because the click.Choice
@@ -169,9 +170,7 @@ def tuple_to_set_callback(
     return set(value)
 
 
-def output_dir_callback(
-    ctx: click.Context, _: click.Parameter, value: Optional[Path]
-) -> Optional[Path]:
+def output_dir_callback(ctx: click.Context, _: click.Parameter, value: Path | None) -> Path | None:
     """
     Callback for ``--output-dir option``.
 
@@ -227,7 +226,7 @@ def ensure_at_least_one_param(ctx: click.Context) -> None:
 
 
 def wrap_string(
-    string: str, width: int, initial_indent: int, indent: int, max_lines: Optional[int] = None
+    string: str, width: int, initial_indent: int, indent: int, max_lines: int | None = None
 ) -> str:
     """
     Wraps a string to a specified width.

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/utils/task_runner.py

@@ -1,6 +1,7 @@
+from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Callable, Optional, Union, get_type_hints
+from typing import Any, get_type_hints
 
 from foundrytools import Font
 from foundrytools.lib.font_finder import (
@@ -28,9 +29,9 @@ class SaveOptions:
     A class that specifies how to save the font.
     """
 
-    reorder_tables: Optional[bool] = True
+    reorder_tables: bool | None = True
     suffix: str = ""
-    output_dir: Optional[Path] = None
+    output_dir: Path | None = None
     overwrite: bool = False
 
 
@@ -74,7 +75,7 @@ class TaskRunnerConfig:  # pylint: disable=too-few-public-methods
 
     @staticmethod
     def _set_options(
-        options_group: Union[dict, FinderOptions, SaveOptions], options: dict[str, Any]
+        options_group: dict | FinderOptions | SaveOptions, options: dict[str, Any]
     ) -> None:
         """
         Update attributes of an options_group with provided options if the attribute exists.

{foundrytools_cli-2.0.4 → foundrytools_cli-2.1.0}/src/foundrytools_cli/utils/timer.py

@@ -1,9 +1,10 @@
 # https://realpython.com/python-timer/#the-python-timer-code
 
 import time
+from collections.abc import Callable
 from contextlib import ContextDecorator
 from dataclasses import dataclass, field
-from typing import Any, Callable, ClassVar, Optional
+from typing import Any, ClassVar
 
 
 class TimerError(Exception):
@@ -15,10 +16,10 @@ class Timer(ContextDecorator):
     """Time your code using a class, context manager, or decorator"""
 
     timers: ClassVar[dict[str, float]] = {}
-    name: Optional[str] = None
+    name: str | None = None
     text: str = "Elapsed time: {:0.4f} seconds"
-    logger: Optional[Callable[[str], None]] = print
-    _start_time: Optional[float] = field(default=None, init=False, repr=False)
+    logger: Callable[[str], None] | None = print
+    _start_time: float | None = field(default=None, init=False, repr=False)
 
     def __post_init__(self) -> None:
         """Initialization: add timer to dict of timers"""

foundrytools_cli-2.0.4/src/foundrytools_cli/__init__.py

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