foundrytools-cli 2.2.0__tar.gz → 2.2.2__tar.gz

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: foundrytools-cli
-Version: 2.2.0
+Version: 2.2.2
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Author: Cesare Gilento
 Author-email: Cesare Gilento <ftcli@proton.me>
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.15
 Classifier: Topic :: Text Processing :: Fonts
 Requires-Dist: afdko==4.0.3
 Requires-Dist: click>=8.5.0
-Requires-Dist: foundrytools>=0.1.6
+Requires-Dist: foundrytools>=0.1.8
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: pathvalidate>=3.3.1
 Requires-Dist: rich>=15.0.0

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "foundrytools-cli"
-version = "2.2.0"
+version = "2.2.2"
 description = "A set of command line tools to inspect, manipulate and convert font files"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -12,7 +12,7 @@ license = "MIT"
 dependencies = [
     "afdko==4.0.3",
     "click>=8.5.0",
-    "foundrytools>=0.1.6",
+    "foundrytools>=0.1.8",
     "loguru>=0.7.3",
     "pathvalidate>=3.3.1",
     "rich>=15.0.0",
@@ -107,9 +107,9 @@ docstring-code-format = true
 docstring-code-line-length = "dynamic"
 
 [tool.bumpversion]
-current_version = "2.2.0"
-commit = false
-tag = false
+current_version = "2.2.2"
+commit = true
+tag = true
 
 [[tool.bumpversion.files]]
 filename = "src/foundrytools_cli/__init__.py"

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/pyproject.toml.orig

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "foundrytools-cli"
-version = "2.2.0"
+version = "2.2.2"
 description = "A set of command line tools to inspect, manipulate and convert font files"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -13,7 +13,7 @@ authors = [{ name = "Cesare Gilento", email = "ftcli@proton.me" }]
 dependencies = [
     "afdko==4.0.3",
     "click>=8.5.0",
-    "foundrytools>=0.1.6",
+    "foundrytools>=0.1.8",
     "loguru>=0.7.3",
     "pathvalidate>=3.3.1",
     "rich>=15.0.0",
@@ -92,9 +92,9 @@ docstring-code-format = true
 docstring-code-line-length = "dynamic"
 
 [tool.bumpversion]
-current_version = "2.2.0"
-commit = false
-tag = false
+current_version = "2.2.2"
+commit = true
+tag = true
 
 [[tool.bumpversion.files]]
 filename = "src/foundrytools_cli/__init__.py"

foundrytools_cli-2.2.2/src/foundrytools_cli/__init__.py

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

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/src/foundrytools_cli/commands/font.py

@@ -11,6 +11,46 @@ from foundrytools_cli.utils.task_runner import TaskRunner
 cli = click.Group(help="Font level utilities.")
 
 
+@cli.command("add-extremes", cls=BaseCommand)
+@click.option(
+    "--keep-hinting",
+    is_flag=True,
+    help="Preserve hinting when adding extrema points.",
+)
+@click.option(
+    "--tolerance",
+    type=click.FloatRange(min=0),
+    default=1.0,
+    show_default=True,
+    help="Do not add extrema points within this distance (font units) of existing points.",
+)
+def add_extremes(input_path: Path, **options: dict[str, Any]) -> None:
+    """
+    Add points at the horizontal and vertical extrema of glyph curves.
+
+    Composite glyphs in TrueType fonts and variable fonts are not modified.
+    """
+
+    def task(font: Font, keep_hinting: bool = False, tolerance: float = 1.0) -> bool:
+        modified_glyphs = font.add_extremes(
+            remove_hinting=not keep_hinting,
+            tolerance=tolerance,
+        )
+        if not modified_glyphs:
+            logger.info("No glyphs were modified")
+            return False
+
+        logger.opt(colors=True).info(
+            f"{len(modified_glyphs)} glyphs were modified: "
+            f"<lc>{', '.join(sorted(modified_glyphs))}</lc>"
+        )
+        return True
+
+    runner = TaskRunner(input_path=input_path, task=task, **options)
+    runner.filter.filter_out_variable = True
+    runner.run()
+
+
 @cli.command("correct-contours", cls=BaseCommand)
 @click.option(
     "-ma",

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/src/foundrytools_cli/commands/otf.py

@@ -258,12 +258,53 @@ def round_coordinates(input_path: Path, **options: dict[str, Any]) -> None:
     The number of vertical stem values to extract.
     """,
 )
+@click.option(
+    "--use-samples/--all-glyphs",
+    default=True,
+    show_default=True,
+    help="Calculate each value from its default or custom glyph sample, or from the whole font.",
+)
+@click.option(
+    "--std-h-sample",
+    multiple=True,
+    help="Characters to sample for StdHW; may be repeated. Defaults to the built-in sample.",
+)
+@click.option(
+    "--std-v-sample",
+    multiple=True,
+    help="Characters to sample for StdVW; may be repeated. Defaults to the built-in sample.",
+)
+@click.option(
+    "--snap-h-sample",
+    multiple=True,
+    help="Characters to sample for StemSnapH; may be repeated. Defaults to the built-in sample.",
+)
+@click.option(
+    "--snap-v-sample",
+    multiple=True,
+    help="Characters to sample for StemSnapV; may be repeated. Defaults to the built-in sample.",
+)
 def recalc_stems(input_path: Path, **options: dict[str, Any]) -> None:
     """
     Recalculate the hinting stems of OpenType-PS fonts.
     """
 
-    def task(font: Font) -> bool:
+    sample_options = ("std_h_sample", "std_v_sample", "snap_h_sample", "snap_v_sample")
+    if not options["use_samples"] and any(options[name] for name in sample_options):
+        raise click.UsageError("Custom glyph samples cannot be used with --all-glyphs.")
+
+    def task(
+        font: Font,
+        report_all_stems: bool = False,
+        max_distance: int = 1,
+        max_h_stems: int = 2,
+        max_v_stems: int = 2,
+        use_samples: bool = True,
+        std_h_sample: tuple[str, ...] = (),
+        std_v_sample: tuple[str, ...] = (),
+        snap_h_sample: tuple[str, ...] = (),
+        snap_v_sample: tuple[str, ...] = (),
+    ) -> bool:
         if not font.is_ps:
             logger.error("Font is not a PostScript font")
             return False
@@ -273,11 +314,17 @@ def recalc_stems(input_path: Path, **options: dict[str, Any]) -> None:
             return False
 
         flavor = font.ttfont.flavor
-        temp_file = get_temp_file_path()
+        temp_file: Path | None = None
         if flavor is not None:
             font.ttfont.flavor = None
             temp_file = get_temp_file_path()
-            font.save(temp_file)
+            try:
+                font.save(temp_file)
+            except Exception:
+                temp_file.unlink(missing_ok=True)
+                raise
+            finally:
+                font.ttfont.flavor = flavor
             input_file = temp_file
         else:
             input_file = font.file
@@ -289,22 +336,31 @@ def recalc_stems(input_path: Path, **options: dict[str, Any]) -> None:
         current_stem_snap_h = font.t_cff_.get_hinting_data().get("StemSnapH", None)
         current_stem_snap_v = font.t_cff_.get_hinting_data().get("StemSnapV", None)
 
-        report_all_stems = cast(bool, options["report_all_stems"])
-        max_distance = cast(int, options["max_distance"])
-        max_h_stems = cast(int, options["max_h_stems"])
-        max_v_stems = cast(int, options["max_v_stems"])
-        std_h_w, std_v_w, stem_snap_h, stem_snap_v = get_stems(
-            input_file,
-            report_all_stems=report_all_stems,
-            max_distance=max_distance,
-            max_h_stems=max_h_stems,
-            max_v_stems=max_v_stems,
-        )
+        def to_codepoints(sample: tuple[str, ...]) -> set[int] | None:
+            codepoints = {ord(char) for text in sample for char in text}
+            return codepoints or None
+
+        try:
+            std_h_w, std_v_w, stem_snap_h, stem_snap_v = get_stems(
+                input_file,
+                report_all_stems=report_all_stems,
+                max_distance=max_distance,
+                max_h_stems=max_h_stems,
+                max_v_stems=max_v_stems,
+                use_samples=use_samples,
+                std_h_codepoints=to_codepoints(std_h_sample),
+                std_v_codepoints=to_codepoints(std_v_sample),
+                snap_h_codepoints=to_codepoints(snap_h_sample),
+                snap_v_codepoints=to_codepoints(snap_v_sample),
+            )
+        finally:
+            if temp_file is not None:
+                temp_file.unlink(missing_ok=True)
+
         logger.info(f"StdHW: {current_std_h_w} -> {std_h_w}")
         logger.info(f"StdVW: {current_std_v_w} -> {std_v_w}")
         logger.info(f"StemSnapH: {current_stem_snap_h} -> {stem_snap_h}")
         logger.info(f"StemSnapV: {current_stem_snap_v} -> {stem_snap_v}")
-        temp_file.unlink(missing_ok=True)
 
         if (current_std_h_w, current_std_v_w, current_stem_snap_h, current_stem_snap_v) == (
             std_h_w,
@@ -321,7 +377,6 @@ def recalc_stems(input_path: Path, **options: dict[str, Any]) -> None:
             "StemSnapV": stem_snap_v,
         }
         font.t_cff_.set_hinting_data(**hinting_data)
-        font.ttfont.flavor = flavor
         return True
 
     runner = TaskRunner(input_path=input_path, task=task, **options)

{foundrytools_cli-2.2.0 → foundrytools_cli-2.2.2}/src/foundrytools_cli/commands/utils/font_organizer.py

@@ -50,14 +50,20 @@ def _determine_output_directory(
     return sanitize_filepath(out_dir, platform="auto")
 
 
-def _remove_empty_directories(directory: Path) -> None:
+def _remove_empty_directories(directory: Path, stop_at: Path | None = None) -> None:
     """
     Removes empty directories recursively.
 
     Args:
         directory (Path): The directory to start removing from.
+        stop_at (Path): The directory to stop at (never removed). Defaults to None, which
+            means no boundary. Callers should pass the input directory so cleanup never
+            climbs above it.
     """
-    while not any(directory.iterdir()):
+    stop = stop_at.resolve() if stop_at is not None else None
+    while directory.is_dir() and (stop is None or directory.resolve() != stop):
+        if any(directory.iterdir()):
+            break
         directory.rmdir()
         logger.opt(colors=True).success(f"{directory} <magenta>--></> <red>Deleted</>")
         directory = directory.parent
@@ -115,4 +121,5 @@ def main(
             )
 
         if delete_empty_directories:
-            _remove_empty_directories(font.file.parent)
+            stop_at = in_path if in_path.is_dir() else in_path.parent
+            _remove_empty_directories(font.file.parent, stop_at=stop_at)

foundrytools_cli-2.2.0/src/foundrytools_cli/__init__.py

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