Merge pull request #671 from anthrotype/cffsubr

support subroutinizing with cffsubr; add otf-cff2 static output

Lib/fontmake/__main__.py

@@ -124,6 +124,7 @@ def main(args=None):
  choices=(
  "ufo",
  "otf",
+ "otf-cff2",
  "ttf",
  "ttf-interpolatable",
  "otf-interpolatable",
@@ -280,6 +281,14 @@ def main(args=None):
  help="0 disables all optimizations; 1 specializes the CFF charstring "
  "operators; 2 (default) also enables subroutinization",
  )
+ contourGroup.add_argument(
+ "--subroutinizer",
+ default=None,
+ choices=["compreffor", "cffsubr"],
+ help="name of the library to use for compressing CFF charstrings. "
+ "Choose between: %(choices)s. By default compreffor is used for CFF 1, "
+ "and cffsubr for CFF2. NOTE: compreffor doesn't support CFF2.",
+ )
  contourGroup.add_argument(
  "--no-optimize-gvar",
  dest="optimize_gvar",

Lib/fontmake/font_project.py

@@ -291,6 +291,7 @@ def build_variable_font(
  output_dir=None,
  ttf=True,
  optimize_gvar=True,
+ optimize_cff=CFFOptimization.SPECIALIZE,
  use_production_names=None,
  reverse_direction=True,
  conversion_error=None,
@@ -333,6 +334,7 @@ def build_variable_font(
  useProductionNames=use_production_names,
  roundTolerance=cff_round_tolerance,
  debugFeatureFile=debug_feature_file,
+ optimizeCFF=optimize_cff,
  inplace=True,
  )
 
@@ -343,7 +345,7 @@ def _iter_compile(self, ufos, ttf=False, debugFeatureFile=None, **kwargs):
  # yields ttFont instances
  options = dict(kwargs)
  if ttf:
- for key in ("optimizeCFF", "roundTolerance"):
+ for key in ("optimizeCFF", "roundTolerance", "subroutinizer", "cffVersion"):
  options.pop(key, None)
  compile_func, fmt = ufo2ft.compileTTF, "TTF"
  else:
@@ -387,6 +389,8 @@ def save_otfs(
  output_dir=None,
  debug_feature_file=None,
  inplace=True,
+ cff_version=1,
+ subroutinizer=None,
  ):
  """Build OpenType binaries from UFOs.
 
@@ -476,6 +480,8 @@ def save_otfs(
  cubicConversionError=conversion_error,
  featureWriters=feature_writers,
  debugFeatureFile=debug_feature_file,
+ cffVersion=cff_version,
+ subroutinizer=subroutinizer,
  inplace=True, # avoid extra copy
  )
 
@@ -1024,6 +1030,9 @@ def run_from_ufos(self, ufos, output=(), **kwargs):
  if set(output) == {"ufo"}:
  return
 
+ if "otf" in output and "otf-cff2" in output:
+ raise ValueError("'otf' and 'otf-cff2' outputs are mutually exclusive")
+
  # the `ufos` parameter can be a list of UFO objects
  # or it can be a path (string) with a glob syntax
  ufo_paths = []
@@ -1041,8 +1050,9 @@ def run_from_ufos(self, ufos, output=(), **kwargs):
  )
 
  need_reload = False
- if "otf" in output:
- self.build_otfs(ufos, **kwargs)
+ cff_version = 1 if "otf" in output else 2 if "otf-cff2" in output else None
+ if cff_version is not None:
+ self.build_otfs(ufos, cff_version=cff_version, **kwargs)
  need_reload = True
 
  if "ttf" in output:

requirements.txt

@@ -1,10 +1,11 @@
-fonttools[lxml,unicode,ufo]==4.10.2
+fonttools[lxml,unicode,ufo]==4.11.0
 cu2qu==1.6.7
 glyphsLib==5.1.10
-ufo2ft[pathops]==2.14.0
+ufo2ft[pathops]==2.15.0
 MutatorMath==2.1.2
 fontMath==0.6.0
 defcon[lxml]==0.6.0
 booleanOperations==0.9.0
 ufoLib2==0.7.1
 attrs==19.3.0
+cffsubr==0.2.6

setup.py

@@ -39,10 +39,10 @@
  setup_requires=wheel + ["setuptools_scm"],
  python_requires=">=3.6",
  install_requires=[
- "fonttools[ufo,lxml,unicode]>=4.10.2",
+ "fonttools[ufo,lxml,unicode]>=4.11.0",
  "cu2qu>=1.6.7",
  "glyphsLib>=5.1.10",
- "ufo2ft>=2.14.0",
+ "ufo2ft[cffsubr]>=2.15.0",
  "fontMath>=0.6.0",
  "booleanOperations>=0.9.0",
  "ufoLib2>=0.7.1",

tests/test_main.py

@@ -625,3 +625,35 @@ def test_debug_feature_file(data_dir, tmp_path):
 
  assert "### GlyphsUnitTestSans-Regular" in features
  assert "### GlyphsUnitTestSans-Black" in features
+
+
+def test_ufo_to_static_otf_cff2(data_dir, tmp_path):
+ fontmake.__main__.main(
+ [
+ "-u",
+ str(data_dir / "DesignspaceTest" / "MyFont-Light.ufo"),
+ "-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(
+ [
+ "-u",
+ str(data_dir / "DesignspaceTest" / "MyFont-Light.ufo"),
+ "-o",
+ "otf",
+ "--subroutinizer",
+ "cffsubr",
+ "--output-dir",
+ str(tmp_path),
+ ]
+ )
+
+ assert {p.name for p in tmp_path.glob("*.otf")} == {"MyFont-Light.otf"}