Merge pull request #1166 from googlefonts/builder-fontsetter

Builder: Add fontsetter

Author: m4rc1e

Lib/gftools/builder/operations/fontsetter.py

@@ -0,0 +1,8 @@
+import os
+
+from gftools.builder.operations import OperationBase
+
+
+class Fontsetter(OperationBase):
+    description = "Run gftools-fontsetter"
+    rule = "gftools-fontsetter --inplace $in $args"

Lib/gftools/builder/recipeproviders/googlefonts.py

@@ -122,6 +122,14 @@ def write_recipe(self):
         else:
             self.fvarInstancesFile = None
 
+        if "fontsetter" in self.config:
+            self.fontsetterfiles = {}
+            for font in list(self.config["fontsetter"].keys()):
+                tmp_file = NamedTemporaryFile(delete=False, mode="w+")
+                self.config["fontsetter"][font] = self.config["fontsetter"][font]
+                yaml.dump(self.config["fontsetter"][font], tmp_file)
+                self.fontsetterfiles[font] = tmp_file
+
         # Find variable fonts
         self.recipe = {}
         self.build_all_variables()
@@ -277,6 +285,8 @@ def build_all_variables(self):
             self.build_avar2()
         if "fvarInstances" in self.config:
             self.build_fvar_instances()
+        if "fontsetter" in self.config:
+            self.build_fontsetter()
 
     def build_spacing_axis(self):
         vfs = [x for x in self.recipe.keys() if x.endswith("ttf")]
@@ -331,6 +341,18 @@ def build_fvar_instances(self):
                 self.recipe[vf].append(args)
             self.fvarInstancesFile.close()
 
+    def build_fontsetter(self):
+        vfs = [x for x in self.recipe.keys() if x.endswith("ttf")]
+        for vf in vfs:
+            filename = os.path.basename(vf)
+            if filename not in self.fontsetterfiles:
+                continue
+            args = {
+                "args": self.fontsetterfiles[filename].name,
+                "postprocess": "fontsetter",
+            }
+            self.recipe[vf].append(args)
+
     def _vtt_steps(self, target: str):
         if os.path.basename(target) in self.config.get("vttSources", {}):
             return [
@@ -430,6 +452,8 @@ def build_all_statics(self):
                     self.build_a_static(source, instance, output="ttf")
                 if self.config["buildOTF"]:
                     self.build_a_static(source, instance, output="otf")
+        if "fontsetter" in self.config:
+            self.build_fontsetter()
 
     def build_a_static(self, source: File, instance: InstanceDescriptor, output):
         suffix = self.config.get("filenameSuffix", "")
@@ -561,25 +585,17 @@ def _italic_fixup(self):
         # "italic enough" to convince gftools-fix-font to apply all its italic
         # font fixes (post.italicAngle etc.) when we call it with
         # --include-source-fixes.
-        configfile = NamedTemporaryFile(delete=False, mode="w+")
         family_name = self.sources[0].family_name.replace(" ", "")
-        # Since this is mad YAML, we can't use the normal YAML library
-        # to write this. We'll just write it out manually.
-        configfile.write(
-            f"""
-OS/2->fsSelection: 129
-head->macStyle: "|= 0x02"
-name->setName: ["{family_name}Italic", 25, 3, 1, 0x409]
-name->setName: ["Italic", 2, 3, 1, 0x409]
-name->setName: ["Italic", 17, 3, 1, 0x409]
-        """
-        )
-        configfile.close()
         return [
             {
-                "operation": "exec",
-                "exe": "gftools-fontsetter",
-                "args": "-o $out $in " + configfile.name,
+                "operation": "fontsetter",
+                "values": [
+                    ["OS/2->fsSelection", 129],
+                    ["head->macStyle", "|= 0x02"],
+                    ["name->setName", [f"{family_name}Italic", 25, 3, 1, 0x409]],
+                    ["name->setName", ["Italic", 2, 3, 1, 0x409]],
+                    ["name->setName", ["Italic", 17, 3, 1, 0x409]],
+                ],
             },
             {
                 "operation": "fix",

Lib/gftools/builder/schema.py

@@ -101,6 +101,7 @@
         Optional("logLevel"): Str(),
         Optional("spacingAxis"): MapPattern(Str(), Int()),
         Optional("stat"): stat_schema | stat_schema_by_font_name,
+        Optional("fontsetter"): MapPattern(Str(), Any()),
         Optional("statFormat4"): stat_format4_schema
         | MapPattern(Str(), stat_format4_schema),
         Optional("avar2"): avar2_schema,

Lib/gftools/scripts/fontsetter.py

@@ -130,13 +130,17 @@ def main(args=None):
     parser = argparse.ArgumentParser()
     parser.add_argument("font", type=TTFont)
     parser.add_argument("config")
-    parser.add_argument("-o", "--out", default=None)
+    out = parser.add_mutually_exclusive_group()
+    out.add_argument("--inplace", action="store_true", default=False)
+    out.add_argument("--out", "-o", default=None)
     args = parser.parse_args(args)
 
     config = load_config(args.config)
     set_all(args.font, config)
 
-    if not args.out:
+    if args.inplace:
+        args.out = args.font.reader.file.name
+    elif not args.out:
         args.out = makeOutputFileName(args.font.reader.file.name)
     args.font.save(args.out)