foundrytools-cli 1.1.5__tar.gz → 1.1.6__tar.gz

{foundrytools-cli-1.1.5/foundrytools_cli.egg-info → foundrytools-cli-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.5
+Version: 1.1.6
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -10,11 +10,11 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: afdko>=4.0.0
-Requires-Dist: fonttools>=4.46.0
+Requires-Dist: afdko>=4.0.1
+Requires-Dist: fonttools>=4.47.2
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
-Requires-Dist: cffsubr>=0.2.9.post1
+Requires-Dist: cffsubr>=0.3.0
 Requires-Dist: dehinter>=4.0.0
 Requires-Dist: loguru>=0.7.2
 Requires-Dist: pathvalidate>=3.2.0

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6}/foundryToolsCLI/CLI/ftcli_cff.py

@@ -33,6 +33,7 @@ tbl_cff = click.Group("subcommands")
     "--copyright", "Copyright", is_flag=True, help="Deletes CFF.cff.topDictIndex[0] Copyright"
 )
 @click.option("--notice", "Notice", is_flag=True, help="Deletes CFF.cff.topDictIndex[0] Copyright")
+@click.option("--unique-id", "UniqueID", is_flag=True, help="Deletes CFF.cff.topDictIndex[0] UniqueID")
 @add_recursive_option()
 @add_common_options()
 @Timer(logger=logger.info)

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6}/foundryToolsCLI/Lib/utils/ps_recalc_zones.py

@@ -4,9 +4,9 @@ from collections import Counter
 from fontTools.pens.boundsPen import BoundsPen
 from fontTools.ttLib.ttFont import TTFont
 
-UPPERCASE_LETTERS = [chr(i) for i in range(65, 91)]
+UPPERCASE_LETTERS = [chr(i) for i in range(65, 91)]  # A-Z
 UPPERCASE_DESCENDERS = ["J", "Q"]
-LOWERCASE_LETTERS = [chr(i) for i in range(97, 123)]
+LOWERCASE_LETTERS = [chr(i) for i in range(97, 123)]  # a-z
 LOWERCASE_DESCENDERS = ["f", "g", "j", "p", "q", "y"]
 LOWERCASE_ASCENDERS = ["b", "d", "f", "h", "k", "l", "t"]
 
@@ -21,7 +21,7 @@ UPPERCASE_GLYPHS = UPPERCASE_LETTERS
 ASCENDER_GLYPHS = list(set(LOWERCASE_ASCENDERS) - {"t"})
 
 
-__all__ = ["recalc_zones"]
+__all__ = ["recalc_zones", "GlyphBounds"]
 
 
 class GlyphBounds(t.TypedDict):
@@ -137,6 +137,29 @@ def fix_lists_overlaps(lists: t.List[t.List[float]]) -> t.List[t.List[float]]:
     return lists
 
 
+def fix_min_separation_limits(lists: t.List[t.List[float]], limit: int) -> t.List[t.List[float]]:
+    """
+    Fixes the minimum separation between zones.
+
+    Args:
+        lists (List[List[float]]): A list of lists of floats.
+        limit (int): The minimum separation between zones.
+
+    Returns:
+        List[List[float]]: The input list with the minimum separation between zones fixed.
+    """
+    for i in range(len(lists) - 1):
+        if lists[i + 1][0] - lists[i][1] < limit:
+            # If the difference between the two values is less than 3, then
+            # set the second value to the first value
+            if lists[i + 1][1] - lists[i][1] > limit:
+                lists[i + 1][0] = lists[i + 1][1]
+            else:
+                # Remove the second list
+                lists.pop(i + 1)
+    return lists
+
+
 def calculate_zone(
     font: TTFont, glyph_names: t.List[str], min_or_max: t.Literal["yMin", "yMax"]
 ) -> t.List[float]:
@@ -211,7 +234,13 @@ def recalc_zones(
     if lists_overlaps(zones):
         zones = fix_lists_overlaps(zones)
 
+    min_separation = font["CFF "].cff.topDictIndex[0].Private.BlueFuzz * 2 + 1
+    zones = fix_min_separation_limits(zones, limit=min_separation)
+
     other_blues = [int(v) for v in zones[0]]
-    blue_values = [int(v) for v in zones[1] + zones[2] + zones[3] + zones[4]]
+
+    blue_values = []
+    for zone in zones[1:]:
+        blue_values.extend([int(v) for v in zone])
 
     return other_blues, blue_values

foundrytools-cli-1.1.6/foundryToolsCLI/__init__.py

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

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.5
+Version: 1.1.6
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -10,11 +10,11 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: afdko>=4.0.0
-Requires-Dist: fonttools>=4.46.0
+Requires-Dist: afdko>=4.0.1
+Requires-Dist: fonttools>=4.47.2
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
-Requires-Dist: cffsubr>=0.2.9.post1
+Requires-Dist: cffsubr>=0.3.0
 Requires-Dist: dehinter>=4.0.0
 Requires-Dist: loguru>=0.7.2
 Requires-Dist: pathvalidate>=3.2.0

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6}/foundrytools_cli.egg-info/requires.txt

@@ -1,8 +1,8 @@
-afdko>=4.0.0
-fonttools>=4.46.0
+afdko>=4.0.1
+fonttools>=4.47.2
 brotli>=1.1.0
 click>=8.1.7
-cffsubr>=0.2.9.post1
+cffsubr>=0.3.0
 dehinter>=4.0.0
 loguru>=0.7.2
 pathvalidate>=3.2.0

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6}/requirements.txt

@@ -1,9 +1,9 @@
 # Hard pinning here gets relaxed to ">=" in setup.py
-afdko==4.0.0
-fonttools==4.46.0
+afdko==4.0.1
+fonttools==4.47.2
 brotli==1.1.0
 click==8.1.7
-cffsubr==0.2.9.post1
+cffsubr==0.3.0
 dehinter==4.0.0
 loguru==0.7.2
 pathvalidate==3.2.0

{foundrytools-cli-1.1.5 → foundrytools-cli-1.1.6}/setup.py

@@ -18,7 +18,7 @@ def _get_requirements():
 
 setuptools.setup(
     name="foundrytools-cli",
-    version="1.1.5",
+    version="1.1.6",
     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.5/foundryToolsCLI/__init__.py

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