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

{foundrytools-cli-1.0.2.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.2.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

{foundrytools-cli-1.0.2.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.2.1 → foundrytools-cli-1.0.3}/foundryToolsCLI/Lib/converters/ttf_to_otf.py

@@ -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()
@@ -71,12 +68,7 @@ class TTF2OTFRunner(object):
 
                 if len(failed) > 0:
                     generic_info_message(f"Retrying to get {len(failed)} charstrings...")
-                    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)
+                    fallback_charstrings = get_fallback_charstrings(font=source_font)
 
                     for c in failed:
                         try:
@@ -90,16 +82,13 @@ class TTF2OTFRunner(object):
                 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.2.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.2.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

{foundrytools-cli-1.0.2.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.2.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",