foundrytools-cli 2.0.5__tar.gz → 2.1.1__tar.gz

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foundrytools-cli
-Version: 2.0.5
+Version: 2.1.1
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Author: Cesare Gilento
 Author-email: Cesare Gilento <ftcli@proton.me>
@@ -15,14 +15,15 @@ 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.3
 Requires-Dist: click>=8.3.1
-Requires-Dist: foundrytools>=0.1.5
+Requires-Dist: foundrytools>=0.1.6
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: pathvalidate>=3.3.1
-Requires-Dist: rich>=14.2.0
+Requires-Dist: rich>=14.3.1
 Requires-Dist: ufolib2>=0.18.1
 Requires-Dist: win32-setctime>=1.2.0 ; sys_platform >= 'win32'
 Requires-Python: >=3.10

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "foundrytools-cli"
-version = "2.0.5"
+version = "2.1.1"
 description = "A set of command line tools to inspect, manipulate and convert font files"
 readme = "README.md"
 license = "MIT"
@@ -24,6 +24,7 @@ classifiers = [
     "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",
 ]
@@ -31,10 +32,10 @@ classifiers = [
 dependencies = [
     "afdko>=4.0.3",
     "click>=8.3.1",
-    "foundrytools>=0.1.5",
+    "foundrytools>=0.1.6",
     "loguru>=0.7.3",
     "pathvalidate>=3.3.1",
-    "rich>=14.2.0",
+    "rich>=14.3.1",
     "ufolib2>=0.18.1",
     "win32-setctime>=1.2.0; sys_platform >= 'win32'",
 ]
@@ -48,7 +49,7 @@ dev = [
 ]
 docs = [
     "sphinx-click>=6.2.0",
-    "sphinx-rtd-theme>=3.0.2",
+    "sphinx-rtd-theme>=3.1.0",
 ]
 
 [project.scripts]
@@ -58,9 +59,9 @@ ftcli = "foundrytools_cli.__main__:cli"
 Homepage = "https://github.com/ftCLI/FoundryTools-CLI"
 
 [tool.bumpversion]
-current_version = "2.0.5"
+current_version = "2.1.1"
 commit = false
-tag = true
+tag = false
 
 [[tool.bumpversion.files]]
 filename = "src/foundrytools_cli/__init__.py"

foundrytools_cli-2.1.1/src/foundrytools_cli/__init__.py

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

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/src/foundrytools_cli/commands/converter/cli.py

@@ -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,

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/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.5 → foundrytools_cli-2.1.1}/src/foundrytools_cli/commands/otf.py

@@ -4,6 +4,7 @@ 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
@@ -58,8 +59,8 @@ def subroutinize_flag() -> Callable:
     """,
 )
 @click.option(
-    "-d",
-    "--decimal",
+    "-d/-no-d",
+    "--decimal/--no-decimal",
     "roundCoords",
     is_flag=True,
     default=True,
@@ -95,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
@@ -270,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.5 → foundrytools_cli-2.1.1}/src/foundrytools_cli/commands/utils/cli.py

@@ -39,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="""
@@ -53,18 +53,9 @@ 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(
-    "-o",
-    "--overwrite",
-    "overwrite",
-    is_flag=True,
-    help="""
-        Allow overwriting output files. THIS MIGHT POTENTIALLY RESULT IN LOSS OF FILES.
-        USE WITH CARE.
-    """,
-)
 @recursive_flag()
 def font_renamer(input_path: Path, **options: dict[str, Any]) -> None:
     """

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/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,12 +105,18 @@ 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")
 
 
-def main(font: Font, source: int = 1, overwrite: bool = False) -> None:
+def main(font: Font, source: int = 1) -> None:
     """
     Renames the given font files.
     """
@@ -66,20 +128,23 @@ def main(font: Font, source: int = 1, overwrite: bool = False) -> None:
             f"source=4 and source=5 can be used for OTF files only. Using source=1 for "
             f"{old_file.name}"
         )
+
     new_file_name = sanitize_filename(_get_file_stem(font=font, source=source))
     new_file = font.get_file_path(
         file=Path(new_file_name),
         extension=font.get_file_ext(),
         output_dir=old_file.parent,
-        overwrite=overwrite,
+        overwrite=True,
     )
     if new_file == old_file:
         logger.skip(f"{old_file.name} is already named correctly")  # type: ignore
         return
+
     if new_file.exists():
         logger.warning(f"Another file named {new_file.name} already exists")
         logger.skip(f"{old_file.name} was not renamed")  # type: ignore
         return
+
     try:
         old_file.rename(new_file)
         logger.opt(colors=True).info(

{foundrytools_cli-2.0.5 → foundrytools_cli-2.1.1}/src/foundrytools_cli/utils/__init__.py

@@ -42,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="""
@@ -55,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="""
@@ -67,7 +67,7 @@ class BaseCommand(click.Command):
                 """,
             ),
             click.Option(
-                ["-rtb", "--reorder-tables", "reorder_tables"],
+                ["-rtb", "--reorder-tables"],
                 is_flag=True,
                 default=False,
                 help="""

foundrytools_cli-2.0.5/src/foundrytools_cli/__init__.py

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