Merge pull request #909 from NightFurySL2001/main

Minor improvements on UFOZ files

Author: anthrotype

Lib/fontmake/__main__.py

@@ -132,9 +132,9 @@ def parse_mutually_exclusive_inputs(parser, args):
             if designspace_path:
                 parser.error("Only one *.designspace source file is allowed")
             designspace_path = filename
-        elif (filename.endswith(".ufo") and os.path.isdir(filename)) or (
-            filename.endswith(".ufoz") and os.path.isfile(filename)
-        ):
+        elif (
+            os.path.normpath(filename).endswith(".ufo") and os.path.isdir(filename)
+        ) or (filename.endswith(".ufoz") and os.path.isfile(filename)):
             ufo_paths.append(filename)
         else:
             parser.error(f"Unknown input file extension: {filename!r}")

README.md

@@ -40,7 +40,7 @@ There are two ways to specify the source file or files:
 
 One can either use the following, mutually exclusive, flags:
 * `-g filename.glyphs`: Converts a Glyphs source file to binary.
-* `-u filename.ufo ...`: Converts one or more UFO files to binary.
+* `-u filename.ufo ...`: Converts one or more UFO(Z) files to binary.
 * `-m filename.designspace`: Converts a Designspace file to binary. (The `-m` is for `mutatormath`, an old Python library for handling designspaces.)
 
 Alternatively, one can specify the input(s) as positional arguments without the flag, letting fontmake infer the source format from the file extension: e.g. ``fontmake MyFont.designspace``, etc.
@@ -70,7 +70,7 @@ The following output file formats are also available, but are generally used int
 
 * `otf-interpolatable`: OTF binaries suitable for merging into a variable font. Placed in the `master_otf_interpolatable/` directory. (These differ from `otf` in that the outlines are unoptimized.)
 * `ttf-interpolatable`: TTF binaries suitable for merging into a variable font. Placed in the `master_ttf_interpolatable/` directory. (The outlines are converted to quadratic curves in an interpolation-compatible way.)
-* `ufo`: Glyphs sources can be converted to UFO. Placed in the `master_ufo/` directory.
+* `ufo`: Glyphs sources can be converted to UFO, or to UFO zip (`.ufoz`) format with the flag `--save-ufo-as-zip`. Placed in the `master_ufo/` directory. 
 
 If no format option is specified, the default is `-o otf ttf`.
 

tests/data/DesignspaceTest/MyFont-Bold.ufoz

@@ -709,6 +709,21 @@ def test_ufo_to_static_otf_cff2(data_dir, tmp_path):
     assert {p.name for p in tmp_path.glob("*.otf")} == {"MyFont-Light.otf"}
 
 
+def test_ufoz_to_static_otf_cff2(data_dir, tmp_path):
+    fontmake.__main__.main(
+        [
+            "-u",
+            str(data_dir / "DesignspaceTest" / "MyFont-Light.ufoz"),
+            "-o",
+            "otf-cff2",
+            "--output-dir",
+            str(tmp_path),
+        ]
+    )
+
+    assert {p.name for p in tmp_path.glob("*.otf")} == {"MyFont-Light.otf"}
+
+
 def test_static_otf_cffsubr_subroutinizer(data_dir, tmp_path):
     fontmake.__main__.main(
         [