Merge pull request #405 from googlefonts/pyup-scheduled-update-2020-0…

…9-14 Scheduled weekly dependency update for week 37
googlefonts · Sep 21, 2020 · c549fa8 · c549fa8
2 parents 3dda980 + 563108c
commit c549fa8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Lib/ufo2ft/postProcessor.py b/Lib/ufo2ft/postProcessor.py
@@ -178,13 +178,15 @@ def _rename_glyphs_from_ufo(self):
             otf["post"].extraNames = []
             otf["post"].compile(otf)
 
-        if "CFF " in otf:
-            cff = otf["CFF "].cff.topDictIndex[0]
+        cff_tag = "CFF " if "CFF " in otf else "CFF2" if "CFF2" in otf else None
+        if cff_tag == "CFF " or (cff_tag == "CFF2" and otf.isLoaded(cff_tag)):
+            cff = otf[cff_tag].cff.topDictIndex[0]
             char_strings = cff.CharStrings.charStrings
             cff.CharStrings.charStrings = {
                 rename_map.get(n, n): v for n, v in char_strings.items()
             }
-            cff.charset = [rename_map.get(n, n) for n in cff.charset]
+            if cff_tag == "CFF ":
+                cff.charset = [rename_map.get(n, n) for n in cff.charset]
 
     def _build_production_names(self):
         seen = {}

diff --git a/requirements.txt b/requirements.txt
@@ -1,9 +1,9 @@
-fonttools[lxml,ufo]==4.11.0
-defcon==0.6.0
+fonttools[ufo,lxml]==4.14.0
+defcon==0.7.2
 cu2qu==1.6.7
 compreffor==0.5.0
 booleanOperations==0.9.0
-cffsubr==0.2.6
+cffsubr==0.2.7
 
 # alternative UFO implementation
 ufoLib2==0.7.1