foundrytools-cli 1.0.1__tar.gz → 1.0.3__tar.gz

{foundrytools-cli-1.0.1/foundrytools_cli.egg-info → foundrytools-cli-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.0.1
+Version: 1.0.3
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -28,7 +28,7 @@ The command line interface is built with [click](https://github.com/pallets/clic
 [rich](https://github.com/Textualize/rich).
 
 Even if not directly imported to keep the footprint as small as possible, portions of code have been copied from
-[fontbakery](https://github.com/googlefonts/fontbakery).
+[fontbakery](https://github.com/googlefonts/fontbakery) and [font-line](https://github.com/source-foundry/font-line).
 
 ## Installation
 FoundryTools-CLI requires Python 3.9 or later.
@@ -47,6 +47,9 @@ FoundryTools-CLI releases are available on the Python Package Index (PyPI), so i
 If you would like to contribute to the development, you can clone the repository from GitHub, install the package in
 'editable' mode and modify the source code in place. We strongly recommend using a virtual environment.
 
+**IMPORTANT**: If you have Python 2.x installed in your system, you may have to use `python3` (instead of `python`) in
+the commands below.
+
     # clone the repository:
     git clone https://github.com/ftCLI/foundrytools-cli.git
     cd foundrytools-cli
@@ -63,6 +66,7 @@ If you would like to contribute to the development, you can clone the repository
     # install in 'editable' mode
     python -m pip install -e .
 
+
 ## Documentation
 FoundryTools-CLI is a Terminal app where commands are logically organized into subcommands.
 

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/README.md

@@ -15,7 +15,7 @@ The command line interface is built with [click](https://github.com/pallets/clic
 [rich](https://github.com/Textualize/rich).
 
 Even if not directly imported to keep the footprint as small as possible, portions of code have been copied from
-[fontbakery](https://github.com/googlefonts/fontbakery).
+[fontbakery](https://github.com/googlefonts/fontbakery) and [font-line](https://github.com/source-foundry/font-line).
 
 ## Installation
 FoundryTools-CLI requires Python 3.9 or later.
@@ -34,6 +34,9 @@ FoundryTools-CLI releases are available on the Python Package Index (PyPI), so i
 If you would like to contribute to the development, you can clone the repository from GitHub, install the package in
 'editable' mode and modify the source code in place. We strongly recommend using a virtual environment.
 
+**IMPORTANT**: If you have Python 2.x installed in your system, you may have to use `python3` (instead of `python`) in
+the commands below.
+
     # clone the repository:
     git clone https://github.com/ftCLI/foundrytools-cli.git
     cd foundrytools-cli
@@ -50,6 +53,7 @@ If you would like to contribute to the development, you can clone the repository
     # install in 'editable' mode
     python -m pip install -e .
 
+
 ## Documentation
 FoundryTools-CLI is a Terminal app where commands are logically organized into subcommands.
 

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/CLI/ftcli_utils.py

@@ -226,9 +226,7 @@ def font_renamer(input_path: Path, source: str):
                     )
                 )
                 file.rename(output_file)
-                generic_success_message(
-                    f"{file.name} {click.style('-->', fg='bright_magenta')} {output_file.name}"
-                )
+                generic_success_message(f"{file.name} {click.style('-->', fg='bright_magenta')} {output_file.name}")
             except Exception as e:
                 generic_error_message(e)
         else:

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/Font.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from beziers.line import Line
 from beziers.path import BezierPath
 from beziers.point import Point
+from cffsubr import subroutinize, desubroutinize
 from fontTools.misc.psCharStrings import T2CharString
 from fontTools.misc.timeTools import timestampToString
 from fontTools.pens.boundsPen import BoundsPen
@@ -456,8 +457,6 @@ class Font(TTFont):
         if not self.is_otf:
             return
 
-        from cffsubr import desubroutinize
-
         flavor = self.flavor
         self.flavor = None
         desubroutinize(otf=self)
@@ -470,8 +469,6 @@ class Font(TTFont):
         if not self.is_otf:
             return
 
-        from cffsubr import subroutinize
-
         flavor = self.flavor
         self.flavor = None
         subroutinize(otf=self)

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/converters/otf_to_ttf.py

@@ -25,9 +25,8 @@ class OTF2TTFRunner(object):
 
             try:
                 print()
-                generic_info_message(f"Converting file {count} of {len(source_fonts)}")
-
                 file = Path(source_font.reader.file.name)
+                generic_info_message(f"Converting file {count} of {len(source_fonts)}: {file.name}")
 
                 # If the source font is a WOFF or WOFF2, we add a suffix to avoid unwanted overwriting
                 if source_font.flavor is None:

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/converters/sfnt_to_web.py

@@ -19,14 +19,14 @@ class FT2WFRunner(object):
 
         for count, font in enumerate(fonts, start=1):
             t = time.time()
-            print()
-            generic_info_message(f"Converting file {count} of {len(fonts)}")
 
             try:
                 if font.flavor is not None:
                     continue
 
-                file = font.reader.file.name
+                file = Path(font.reader.file.name)
+                print()
+                generic_info_message(f"Converting file {count} of {len(fonts)}: {file.name}")
 
                 if self.options.woff:
                     converter = SFNTToWeb(font=font, flavor="woff")

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/converters/ttf_to_otf.py

@@ -31,11 +31,11 @@ class TTF2OTFRunner(object):
 
         for count, source_font in enumerate(source_fonts, start=1):
             t = time.time()
-            print()
-            generic_info_message(f"Converting file {count} of {len(source_fonts)}")
 
             try:
                 file = Path(source_font.reader.file.name)
+                print()
+                generic_info_message(f"Converting file {count} of {len(source_fonts)}: {file.name}")
 
                 # If the source font is a WOFF or WOFF2, we add a suffix to avoid unwanted overwriting
                 flavor = source_font.flavor
@@ -57,11 +57,8 @@ class TTF2OTFRunner(object):
                     )
                 )
 
-                temp_source_fd, temp_source_file = tempfile.mkstemp(suffix=".ttf")
                 if self.options.scale_upm:
                     source_font.ttf_scale_upem(units_per_em=self.options.scale_upm)
-                    source_font.save(temp_source_file)
-                    source_font = Font(temp_source_file, recalcTimestamp=self.options.recalc_timestamp)
 
                 # Decomponentize the source font
                 source_font.ttf_decomponentize()
@@ -70,36 +67,28 @@ class TTF2OTFRunner(object):
                 failed, charstrings = get_qu2cu_charstrings(font=source_font, tolerance=tolerance)
 
                 if len(failed) > 0:
-                    generic_info_message(f"Getting {len(failed)} charstrings with makeotf...")
-                    t2_ttf2otf_converter = TrueTypeToCFF(font=source_font)
-                    t2_charstrings = get_t2_charstrings(font=source_font)
-                    t2_otf_font: Font = t2_ttf2otf_converter.run(charstrings=t2_charstrings)
-                    t2_otf_2_ttf_converter = CFFToTrueType(font=t2_otf_font)
-                    t2_otf_2_ttf_font = t2_otf_2_ttf_converter.run()
-                    _, fallback_charstrings = get_qu2cu_charstrings(t2_otf_2_ttf_font)
+                    generic_info_message(f"Retrying to get {len(failed)} charstrings...")
+                    fallback_charstrings = get_fallback_charstrings(font=source_font)
 
                     for c in failed:
                         try:
-                            generic_info_message(f"Retrying to get charstring: {c}", nl=False)
+                            generic_info_message(f"{c}", nl=False)
                             charstrings[c] = fallback_charstrings[c]
-                            click.secho(f" -> OK", fg="green")
+                            click.secho(f" -> {click.style('OK', fg='green')}")
                         except Exception as e:
-                            generic_error_message(f"Failed to get charstring: {c}")
+                            click.secho(f" -> {click.style('FAIL', fg='red')} ({e})")
                             generic_error_message(e)
 
                 ttf2otf_converter = TrueTypeToCFF(font=source_font)
                 cff_font: Font = ttf2otf_converter.run(charstrings=charstrings)
 
+                cff_font.save(output_file)
+                cff_font = Font(output_file, recalcTimestamp=False)
                 cff_font.otf_fix_contours(min_area=25, verbose=False)
-
                 if self.options.subroutinize:
                     cff_font.otf_subroutinize()
-
-                cff_font.flavor = flavor
                 cff_font.save(output_file)
-                if os.path.exists(temp_source_file):
-                    os.close(temp_source_fd)
-                    os.remove(temp_source_file)
+                cff_font.close()
 
                 generic_info_message(f"Elapsed time: {round(time.time() - t, 3)} seconds")
                 file_saved_message(output_file)
@@ -226,3 +215,13 @@ def get_t2_charstrings(font: Font) -> dict:
         t2_charstrings[k] = charstring
 
     return t2_charstrings
+
+
+def get_fallback_charstrings(font: Font) -> dict:
+    ttf2otf_converter = TrueTypeToCFF(font=font)
+    t2_charstrings = get_t2_charstrings(font=font)
+    otf_font: Font = ttf2otf_converter.run(charstrings=t2_charstrings)
+    otf_2_ttf_converter = CFFToTrueType(font=otf_font)
+    otf_font = otf_2_ttf_converter.run()
+    _, fallback_charstrings = get_qu2cu_charstrings(otf_font)
+    return fallback_charstrings

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/converters/web_to_sfnt.py

@@ -19,11 +19,11 @@ class WF2FTRunner(object):
 
         for count, font in enumerate(fonts, start=1):
             t = time.time()
-            print()
-            generic_info_message(f"Converting file {count} of {len(fonts)}")
 
             try:
-                file = font.reader.file.name
+                file = Path(font.reader.file.name)
+                print()
+                generic_info_message(f"Converting file {count} of {len(fonts)}: {file.name}")
 
                 if not font.flavor:
                     continue

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/utils/click_tools.py

@@ -70,8 +70,7 @@ def add_common_options():
 
 def file_overwrite_prompt(input_file: Path) -> bool:
     return click.confirm(
-        f"{click.style(input_file, fg='yellow', bold=True)} already exists. "
-        f"Do you want to overwrite it?"
+        f"{click.style(input_file, fg='yellow', bold=True)} already exists. " f"Do you want to overwrite it?"
     )
 
 

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3/foundrytools_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: foundrytools-cli
-Version: 1.0.1
+Version: 1.0.3
 Summary: A set of command line tools to inspect, manipulate and convert font files
 Home-page: https://github.com/ftCLI/FoundryTools-CLI
 Author: ftCLI
@@ -28,7 +28,7 @@ The command line interface is built with [click](https://github.com/pallets/clic
 [rich](https://github.com/Textualize/rich).
 
 Even if not directly imported to keep the footprint as small as possible, portions of code have been copied from
-[fontbakery](https://github.com/googlefonts/fontbakery).
+[fontbakery](https://github.com/googlefonts/fontbakery) and [font-line](https://github.com/source-foundry/font-line).
 
 ## Installation
 FoundryTools-CLI requires Python 3.9 or later.
@@ -47,6 +47,9 @@ FoundryTools-CLI releases are available on the Python Package Index (PyPI), so i
 If you would like to contribute to the development, you can clone the repository from GitHub, install the package in
 'editable' mode and modify the source code in place. We strongly recommend using a virtual environment.
 
+**IMPORTANT**: If you have Python 2.x installed in your system, you may have to use `python3` (instead of `python`) in
+the commands below.
+
     # clone the repository:
     git clone https://github.com/ftCLI/foundrytools-cli.git
     cd foundrytools-cli
@@ -63,6 +66,7 @@ If you would like to contribute to the development, you can clone the repository
     # install in 'editable' mode
     python -m pip install -e .
 
+
 ## Documentation
 FoundryTools-CLI is a Terminal app where commands are logically organized into subcommands.
 

{foundrytools-cli-1.0.1 → foundrytools-cli-1.0.3}/setup.py

@@ -7,7 +7,7 @@ long_description = this_directory.joinpath("README.md").read_text()
 
 setuptools.setup(
     name="foundrytools-cli",
-    version="1.0.1",
+    version="1.0.3",
     description="A set of command line tools to inspect, manipulate and convert font files",
     long_description=long_description,
     long_description_content_type="text/markdown",