tooling: minor cleanup

2 files changed, 23 insertions, 1 deletions

diff --git a/misc/tools/bake-vf.py b/misc/tools/bake-vf.py
index 9ec8d677f..8128d9220 100644
--- a/misc/tools/bake-vf.py
+++ b/misc/tools/bake-vf.py
@@ -252,6 +252,19 @@ def gen_stat(ttfont):
   buildStatTable(ttfont, STAT_AXES, locations=locations)
 
 
+def fixup_fvar(ttfont):
+  fvar = ttfont['fvar']
+  for a in fvar.axes:
+    if a.axisTag == "wght":
+      a.defaultValue = 400
+      break
+
+
+def fixup_os2(ttfont):
+  os2 = ttfont['OS/2']
+  os2.usWeightClass = 400
+
+
 def main():
   argparser = argparse.ArgumentParser(
     description='Generate STAT table for variable font family')
@@ -281,6 +294,12 @@ def main():
   # build STAT table
   gen_stat(font)
 
+  # # fixup fvar table (set default wght value)
+  # fixup_fvar(font)
+
+  # # fixup OS/2 table (set usWeightClass)
+  # fixup_os2(font)
+
   # save font
   outfile = args.output or args.input
   font.save(outfile)
diff --git a/misc/tools/gen-var-designspace.py b/misc/tools/gen-var-designspace.py
index 03c825ad8..f91d24eec 100644
--- a/misc/tools/gen-var-designspace.py
+++ b/misc/tools/gen-var-designspace.py
@@ -45,7 +45,9 @@ def fixup_instances(designspace):
       fixup_instance(designspace, instance)
     else:
       del designspace.instances[i]
-  # change default opsz value
+
+
+def fixup_axes_defaults(designspace):
   for a in designspace.axes:
     if a.tag == "opsz":
       a.default = a.maximum
@@ -78,6 +80,7 @@ def main(argv):
   designspace = DesignSpaceDocument.fromfile(args.input_designspace)
 
   fixup_instances(designspace)
+  fixup_axes_defaults(designspace)
   fixup_sources(designspace)
 
   designspace.write(args.output_designspace)