Merge pull request #874 from googlefonts/ellipsis-in-filters

accept '...' in --filter/--feature-writer options to extend preexisting

Lib/fontmake/__main__.py

@@ -29,11 +29,23 @@
 
 def _loadPlugins(parser, specs, from_string_func, parser_error_message):
     plugins = []
+    seen_ellipsis = False
     for s in specs:
         if s == "None":
             # magic value that means "don't write any features or don't apply
             # any filters!"
             return []
+        elif s == "...":
+            if seen_ellipsis:
+                parser.error(
+                    parser_error_message.format(
+                        "ValueError", "'...' can only be provided once"
+                    )
+                )
+            seen_ellipsis = True
+            plugins.append(...)
+            continue
+
         try:
             plugins.append(from_string_func(s))
         except Exception as e:
@@ -425,7 +437,8 @@ def main(args=None):
         "the given keyword arguments. The class and module names are "
         "separated by '::'. The option can be repeated multiple times "
         "for each filter class. The option overrides the filters specified "
-        "in the UFO lib.",
+        "in the UFO lib. You can use an ellipsis --filter='...' to keep the "
+        "latter and insert additional --filter(s), either before or after it.",
     )
 
     layoutGroup = parser.add_argument_group(title="Handling of OpenType Layout")
@@ -449,7 +462,9 @@ def main(args=None):
         "separated by '::'. The option can be repeated multiple times "
         "for each writer class. A special value of 'None' will disable "
         "all automatic feature generation. The option overrides both the "
-        "default ufo2ft writers and those specified in the UFO lib.",
+        "default ufo2ft writers and those specified in the UFO lib. "
+        "You can use ellipsis --feature-writer='...' to keep the latter and "
+        "insert additional --feature-writer(s) either before or after those.",
     )
     layoutGroup.add_argument(
         "--debug-feature-file",

requirements.txt

@@ -1,7 +1,7 @@
-fonttools[unicode,lxml,ufo]==4.29.1
+fonttools[unicode,lxml,ufo]==4.32.0
 cu2qu==1.6.7.post1
 glyphsLib==6.0.4
-ufo2ft[pathops]==2.25.3
+ufo2ft[pathops]==2.27.0
 MutatorMath==3.0.1
 fontMath==0.9.1
 defcon[lxml]==0.10.0; platform_python_implementation == 'CPython'

setup.py

@@ -55,9 +55,9 @@
     setup_requires=wheel + ["setuptools_scm"],
     python_requires=">=3.7",
     install_requires=[
-        "fonttools[ufo,lxml,unicode]>=4.28.5",
+        "fonttools[ufo,lxml,unicode]>=4.32.0",
         "glyphsLib>=6.0.4",
-        "ufo2ft[compreffor]>=2.25.2",
+        "ufo2ft[compreffor]>=2.27.0",
         "fontMath>=0.9.1",
         "ufoLib2>=0.13.0",
         "attrs>=19",