foundrytools-cli 2.2.0__py3-none-any.whl → 2.2.2__py3-none-any.whl

foundrytools_cli/__init__.py

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

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/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/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.dist-info → foundrytools_cli-2.2.2.dist-info}/METADATA

@@ -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.dist-info → foundrytools_cli-2.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-foundrytools_cli/__init__.py,sha256=piRNIMDwxlVsenO9vEcQRdlc_hlbUDikT3wDfiEQIEI,55
+foundrytools_cli/__init__.py,sha256=kFf6kATo3E1f6TMp1TkglYgUcEhMpNJgM65FbPdfLXM,55
 foundrytools_cli/__main__.py,sha256=wN2lDr2iQyzfnOP00_P3DyXIxEBbf6K_cuzX5YFH5Fg,1273
 foundrytools_cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foundrytools_cli/commands/cff.py,sha256=6eEZydw0ZyISjYuV0JObmNBI7ijdEvVatKwWc8FM5vw,3386
@@ -10,12 +10,12 @@ foundrytools_cli/commands/fix/__init__.py,sha256=1kJOW26OAkCYYvYDG2H9sCSqqQUQEtw
 foundrytools_cli/commands/fix/cli.py,sha256=bcmppksAZ_vkV5ZyHiCw-B3ukEbul20h5i3A5NfcYhA,17578
 foundrytools_cli/commands/fix/legacy_accents.py,sha256=pUHWxV-a2GZgI8W_K2u-lu2yMQt5YKEpQHUD9FyKl8A,2094
 foundrytools_cli/commands/fix/vertical_metrics.py,sha256=j563oWfe3znOKuEW333Yx60d_14Nt0cGdXg3mkCTIN8,691
-foundrytools_cli/commands/font.py,sha256=Ee5yi_QkvfpCJv-HruHa3F9L0jXSXJYXVXvHuAumK_A,8240
+foundrytools_cli/commands/font.py,sha256=WIxz2qqcLloXWxiuvBMp1lAnXyftQ3lLJSKM_3Xhc08,9490
 foundrytools_cli/commands/gsub.py,sha256=iaOAy4jqW6p_RIBxvixtwaEV5AQivaezy0k_Mcufoqg,1454
 foundrytools_cli/commands/hhea.py,sha256=wRld1Cj2q6RnLspMgj_1Z62pIw6Vhqgrm1RO06_qwwc,3158
 foundrytools_cli/commands/name.py,sha256=2EizKjc3puytua2BVnuCcRuP6NzuwNZpZryPZ8uNL-o,10354
 foundrytools_cli/commands/os_2.py,sha256=htdQgD6QLM4v_opVhDtFf9Qhyrz7_gKToQ-xiMHCTCk,19495
-foundrytools_cli/commands/otf.py,sha256=lgsd-xQ3ID0eCwHo7vqWjYGUnjJFFZz72pESnKJv5IA,10621
+foundrytools_cli/commands/otf.py,sha256=cb8lfxXooGs7nXOx2i33MfFYYgU8nVgTH7A20Q3doCM,12543
 foundrytools_cli/commands/post.py,sha256=HpcQD_FKSw8Pr8a6gs62Ln_X9TtqODWHSKNZBmmMT40,2016
 foundrytools_cli/commands/print/__init__.py,sha256=B1h44RtXGw3V4X5se75oCvQPWkh0RbQ0luHxK6z4ge8,71
 foundrytools_cli/commands/print/cli.py,sha256=34CaQIby0u9tZ2vrsKFmvSVg5WH6eEgP5p9FZRoVDEU,1910
@@ -25,14 +25,14 @@ foundrytools_cli/commands/print/vf_instances.py,sha256=vpp3sMyCcNh9f6CBbOn5lnWr4
 foundrytools_cli/commands/ttf.py,sha256=0ZJc36MM8m12_reMVD6GS5ZpSt84g_9RpXrKz_zqqfI,2151
 foundrytools_cli/commands/utils/__init__.py,sha256=bF8Ue4I4QAaDplSpDSMvtb4AZMWjcYsTNIL5ZBp6-t8,71
 foundrytools_cli/commands/utils/cli.py,sha256=OKX4FEzcDP9DZHyAk0tN2vuFoQ__BtmvIfP34hbsEYE,3685
-foundrytools_cli/commands/utils/font_organizer.py,sha256=9biz8Cxg81qNGtK53zp4xhgncbItE5xRXBL1Y1ZWHqg,4096
+foundrytools_cli/commands/utils/font_organizer.py,sha256=UL2y7Rauax3S3PxMX6CX1lV0Uk-EA8kKjhW2C7s_MpI,4576
 foundrytools_cli/commands/utils/font_renamer.py,sha256=eEWT_1CCXu0mRXTOx5okUQ1NJrqs2RiG-TsRhbAMoRw,5755
 foundrytools_cli/commands/utils/sync_timestamps.py,sha256=h9BMafxlmFllXKyrqBwibQIupS_d2Rp0TXEIfjk7UZQ,3989
 foundrytools_cli/utils/__init__.py,sha256=m-jBbONfS-_WMbpql8GV_1KufNoWOLQuNQtqErH-WmQ,7962
 foundrytools_cli/utils/logger.py,sha256=ZjVgZ1AmzwwH1GEnBU1HP-pFvZv0BKkVV93P2gYvnLc,525
 foundrytools_cli/utils/task_runner.py,sha256=CXVItMJTslNuie_rhPpZrQBX5rgkWbAWX805dFIBInA,6965
 foundrytools_cli/utils/timer.py,sha256=i_E1nM4KuooZwT2_2bkNJCxLrSKBaQCIMaHxTHY-Hzs,1870
-foundrytools_cli-2.2.0.dist-info/WHEEL,sha256=9IUYslYuG_asT4WlWvfk_K76nveuLvSTKDoLeL0cV-Q,80
-foundrytools_cli-2.2.0.dist-info/entry_points.txt,sha256=sNn6z8yZnx3Koh85LS6BYDqzaXZSP4KEvN3AdFGYRao,57
-foundrytools_cli-2.2.0.dist-info/METADATA,sha256=qe-pXLQXlBlh_7Z9QUQAv5VPIk6mkszxwcGvrsHfa5I,3777
-foundrytools_cli-2.2.0.dist-info/RECORD,,
+foundrytools_cli-2.2.2.dist-info/WHEEL,sha256=MWx7psoF7KNST9G72pGtiBYuaXRXQXBk9pw5R6FzYko,80
+foundrytools_cli-2.2.2.dist-info/entry_points.txt,sha256=sNn6z8yZnx3Koh85LS6BYDqzaXZSP4KEvN3AdFGYRao,57
+foundrytools_cli-2.2.2.dist-info/METADATA,sha256=6tU5bWSXQHGA5ZfwJSJF06pr0_LYIkif7VKaxCkSLGs,3777
+foundrytools_cli-2.2.2.dist-info/RECORD,,

{foundrytools_cli-2.2.0.dist-info → foundrytools_cli-2.2.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.13.1
+Generator: uv 0.13.7
 Root-Is-Purelib: true
 Tag: py3-none-any