foundrytools-cli 1.1.11__tar.gz → 1.1.13__tar.gz

{foundrytools-cli-1.1.11/foundrytools_cli.egg-info → foundrytools_cli-1.1.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.11
+Version: 1.1.13
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.49.0
+Requires-Dist: fonttools>=4.53.0
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13}/foundryToolsCLI/CLI/ftcli_os2.py

@@ -591,29 +591,41 @@ def set_version(
 @tbl_os2.command()
 @add_file_or_path_argument()
 @click.option(
-    "-w",
-    "--weight",
-    type=click.IntRange(1, 1000),
-    prompt="New usWeightClass value",
-    required=True,
-    help="usWeightClass value.",
+    "--family-type", "bFamilyType", type=click.IntRange(0, 5), help="Sets 'bFamilyType' value"
+)
+@click.option(
+    "--serif-style", "bSerifStyle", type=click.IntRange(0, 15), help="Sets 'bSerifStyle' value"
+)
+@click.option("--weight", "bWeight", type=click.IntRange(0, 11), help="Sets 'bWeight' value")
+@click.option(
+    "--proportion", "bProportion", type=click.IntRange(0, 9), help="Sets 'bProportion' value"
+)
+@click.option("--contrast", "bContrast", type=click.IntRange(0, 9), help="Sets 'bContrast' value")
+@click.option(
+    "--stroke-variation",
+    "bStrokeVariation",
+    type=click.IntRange(0, 9),
+    help="Sets 'bStrokeVariation' value",
+)
+@click.option("--arm-style", "bArmStyle", type=click.IntRange(0, 11), help="Sets 'bArmStyle' value")
+@click.option(
+    "--letter-form", "bLetterForm", type=click.IntRange(0, 15), help="Sets 'bLetterForm' value"
 )
+@click.option("--midline", "bMidline", type=click.IntRange(0, 13), help="Sets 'bMidline' value")
+@click.option("--x-height", "bXHeight", type=click.IntRange(0, 7), help="Sets 'bXHeight' value")
 @add_recursive_option()
 @add_common_options()
 @Timer(logger=logger.info)
-def set_weight(
+def panose(
     input_path: Path,
-    weight: int,
+    recalc_timestamp,
     recursive: bool = False,
     output_dir: Optional[Path] = None,
-    recalc_timestamp: bool = False,
     overwrite: bool = True,
+    **kwargs,
 ):
     """
-    Sets the Weight class value.
-
-    usWeightClass indicates the visual weight (degree of blackness or thickness of strokes) of the characters in the
-    font. Values from 1 to 1000 are valid.
+    Command line panose editor.
     """
     fonts = get_fonts_in_path(
         input_path=input_path, recursive=recursive, recalc_timestamp=recalc_timestamp
@@ -621,21 +633,27 @@ def set_weight(
     if not initial_check_pass(fonts=fonts, output_dir=output_dir):
         return
 
+    params = {k: v for k, v in kwargs.items() if v is not None}
+    if len(params) == 0:
+        logger.error(Logs.no_parameter)
+        return
+
     for font in fonts:
         try:
             file = Path(font.reader.file.name)
             output_file = Path(makeOutputFileName(file, outputDir=output_dir, overWrite=overwrite))
-            logger.opt(colors=True).info(Logs.current_file, file=file)
+            os2_table: TableOS2 = font["OS/2"]
+            panose_src = os2_table.panose
+            panose_copy = copy(panose_src)
 
-            os_2: TableOS2 = font["OS/2"]
+            for k, v in params.items():
+                setattr(panose_src, k, v)
 
-            if weight == os_2.get_weight_class():
+            if panose_copy.__dict__ != panose_src.__dict__:
+                font.save(output_file)
+                logger.success(Logs.file_saved, file=output_file)
+            else:
                 logger.skip(Logs.file_not_changed, file=file)
-                continue
-
-            os_2.set_weight_class(weight)
-            font.save(output_file)
-            logger.success(Logs.file_saved, file=output_file)
 
         except Exception as e:
             logger.exception(e)
@@ -643,99 +661,84 @@ def set_weight(
             font.close()
 
 
-@tbl_os2.command()
+@tbl_os2.command(no_args_is_help=True)
 @add_file_or_path_argument()
 @click.option(
-    "-w",
+    "-wght",
+    "--weight",
+    "usWeightClass",
+    type=click.IntRange(1, 1000),
+    help="Sets the ``usWeightClass`` value",
+)
+@click.option(
+    "-wdth",
     "--width",
-    prompt="New usWidthClass value",
+    "usWidthClass",
     type=click.IntRange(1, 9),
-    required=True,
-    help="usWidthClass value.",
+    help="Sets the ``usWidthClass`` value",
 )
-@add_recursive_option()
-@add_common_options()
-@Timer(logger=logger.info)
-def set_width(
-    input_path: Path,
-    width: int,
-    recursive: bool = False,
-    output_dir: Optional[Path] = None,
-    recalc_timestamp: bool = False,
-    overwrite: bool = True,
-):
-    """
-    Sets the Width class value.
-
-    usWidthClass indicates a relative change from the normal aspect ratio (width to height ratio) as specified by a font
-    designer for the glyphs in a font. Values from 1 to 9 are valid.
-    """
-    fonts = get_fonts_in_path(
-        input_path=input_path, recursive=recursive, recalc_timestamp=recalc_timestamp
-    )
-    if not initial_check_pass(fonts=fonts, output_dir=output_dir):
-        return
-
-    for font in fonts:
-        try:
-            file = Path(font.reader.file.name)
-            output_file = Path(makeOutputFileName(file, outputDir=output_dir, overWrite=overwrite))
-            logger.opt(colors=True).info(Logs.current_file, file=file)
-
-            os_2: TableOS2 = font["OS/2"]
-
-            if width == os_2.get_width_class():
-                logger.skip(Logs.file_not_changed, file=file)
-                continue
-
-            os_2.set_width_class(width)
-            font.save(output_file)
-            logger.success(Logs.file_saved, file=output_file)
-
-        except Exception as e:
-            logger.exception(e)
-        finally:
-            font.close()
-
-
-@tbl_os2.command()
-@add_file_or_path_argument()
 @click.option(
-    "--family-type", "bFamilyType", type=click.IntRange(0, 5), help="Sets 'bFamilyType' value"
+    "-tasc",
+    "--typo-ascender",
+    "sTypoAscender",
+    type=int,
+    help="Sets the ``sTypoAscender`` value",
 )
 @click.option(
-    "--serif-style", "bSerifStyle", type=click.IntRange(0, 15), help="Sets 'bSerifStyle' value"
+    "-tdsc",
+    "--typo-descender",
+    "sTypoDescender",
+    type=int,
+    help="Sets the ``sTypoDescender`` value",
 )
-@click.option("--weight", "bWeight", type=click.IntRange(0, 11), help="Sets 'bWeight' value")
 @click.option(
-    "--proportion", "bProportion", type=click.IntRange(0, 9), help="Sets 'bProportion' value"
+    "-tlg",
+    "--typo-line-gap",
+    "sTypoLineGap",
+    type=int,
+    help="Sets the ``sTypoLineGap`` value",
 )
-@click.option("--contrast", "bContrast", type=click.IntRange(0, 9), help="Sets 'bContrast' value")
 @click.option(
-    "--stroke-variation",
-    "bStrokeVariation",
-    type=click.IntRange(0, 9),
-    help="Sets 'bStrokeVariation' value",
+    "-wasc",
+    "--win-ascent",
+    "usWinAscent",
+    type=int,
+    help="Sets the ``usWinAscent`` value",
 )
-@click.option("--arm-style", "bArmStyle", type=click.IntRange(0, 11), help="Sets 'bArmStyle' value")
 @click.option(
-    "--letter-form", "bLetterForm", type=click.IntRange(0, 15), help="Sets 'bLetterForm' value"
+    "-wdsc",
+    "--win-descent",
+    "usWinDescent",
+    type=int,
+    help="Sets the ``usWinDescent`` value",
+)
+@click.option(
+    "-xhgt",
+    "--x-height",
+    "sxHeight",
+    type=int,
+    help="Sets the ``sxHeight`` value",
+)
+@click.option(
+    "-chgt",
+    "--cap-height",
+    "sCapHeight",
+    type=int,
+    help="Sets the ``sCapHeight`` value",
 )
-@click.option("--midline", "bMidline", type=click.IntRange(0, 13), help="Sets 'bMidline' value")
-@click.option("--x-height", "bXHeight", type=click.IntRange(0, 7), help="Sets 'bXHeight' value")
 @add_recursive_option()
 @add_common_options()
 @Timer(logger=logger.info)
-def panose(
+def set_attrs(
     input_path: Path,
-    recalc_timestamp,
+    recalc_timestamp: bool = False,
     recursive: bool = False,
     output_dir: Optional[Path] = None,
     overwrite: bool = True,
     **kwargs,
 ):
     """
-    Command line panose editor.
+    Command line OS/2 table editor.
     """
     fonts = get_fonts_in_path(
         input_path=input_path, recursive=recursive, recalc_timestamp=recalc_timestamp
@@ -743,23 +746,18 @@ def panose(
     if not initial_check_pass(fonts=fonts, output_dir=output_dir):
         return
 
-    params = {k: v for k, v in kwargs.items() if v is not None}
-    if len(params) == 0:
-        logger.error(Logs.no_parameter)
-        return
-
     for font in fonts:
         try:
             file = Path(font.reader.file.name)
             output_file = Path(makeOutputFileName(file, outputDir=output_dir, overWrite=overwrite))
             os2_table: TableOS2 = font["OS/2"]
-            panose_src = os2_table.panose
-            panose_copy = copy(panose_src)
+            os2_copy = copy(os2_table)
 
-            for k, v in params.items():
-                setattr(panose_src, k, v)
+            for k, v in kwargs.items():
+                if v is not None:
+                    setattr(os2_table, k, v)
 
-            if panose_copy.__dict__ != panose_src.__dict__:
+            if os2_copy.compile(font) != os2_table.compile(font):
                 font.save(output_file)
                 logger.success(Logs.file_saved, file=output_file)
             else:

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13}/foundryToolsCLI/Lib/Font.py

@@ -479,10 +479,8 @@ class Font(TTFont):
         """
         if not self.is_otf:
             return
-        # noinspection PyUnresolvedReferences
-        from fontTools.subset.cff import remove_hints
 
-        self["CFF "].remove_hints()
+        self["CFF "].cff.remove_hints()
 
     def otf_desubroutinize(self) -> None:
         """

foundrytools_cli-1.1.13/foundryToolsCLI/__init__.py

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

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.1.11
+Version: 1.1.13
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -11,7 +11,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: afdko>=4.0.1
-Requires-Dist: fonttools>=4.49.0
+Requires-Dist: fonttools>=4.53.0
 Requires-Dist: brotli>=1.1.0
 Requires-Dist: click>=8.1.7
 Requires-Dist: cffsubr>=0.3.0

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13}/foundrytools_cli.egg-info/requires.txt

@@ -1,5 +1,5 @@
 afdko>=4.0.1
-fonttools>=4.49.0
+fonttools>=4.53.0
 brotli>=1.1.0
 click>=8.1.7
 cffsubr>=0.3.0

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13}/requirements.txt

@@ -1,6 +1,6 @@
 # Hard pinning here gets relaxed to ">=" in setup.py
 afdko==4.0.1
-fonttools==4.49.0
+fonttools==4.53.0
 brotli==1.1.0
 click==8.1.7
 cffsubr==0.3.0

{foundrytools-cli-1.1.11 → foundrytools_cli-1.1.13}/setup.py

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

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