fonttools 4.57.0__cp311-cp311-macosx_10_9_universal2.whl → 4.58.0__cp311-cp311-macosx_10_9_universal2.whl

fontTools/feaLib/parser.py

@@ -1613,7 +1613,7 @@ class Parser(object):
             "HorizAxis.BaseScriptList",
             "VertAxis.BaseScriptList",
         ), self.cur_token_
-        scripts = [(self.parse_base_script_record_(count))]
+        scripts = [self.parse_base_script_record_(count)]
         while self.next_token_ == ",":
             self.expect_symbol_(",")
             scripts.append(self.parse_base_script_record_(count))
@@ -2062,44 +2062,6 @@ class Parser(object):
             )
         self.expect_symbol_(";")
 
-        # A multiple substitution may have a single destination, in which case
-        # it will look just like a single substitution. So if there are both
-        # multiple and single substitutions, upgrade all the single ones to
-        # multiple substitutions.
-
-        # Check if we have a mix of non-contextual singles and multiples.
-        has_single = False
-        has_multiple = False
-        for s in statements:
-            if isinstance(s, self.ast.SingleSubstStatement):
-                has_single = not any([s.prefix, s.suffix, s.forceChain])
-            elif isinstance(s, self.ast.MultipleSubstStatement):
-                has_multiple = not any([s.prefix, s.suffix, s.forceChain])
-
-        # Upgrade all single substitutions to multiple substitutions.
-        if has_single and has_multiple:
-            statements = []
-            for s in block.statements:
-                if isinstance(s, self.ast.SingleSubstStatement):
-                    glyphs = s.glyphs[0].glyphSet()
-                    replacements = s.replacements[0].glyphSet()
-                    if len(replacements) == 1:
-                        replacements *= len(glyphs)
-                    for i, glyph in enumerate(glyphs):
-                        statements.append(
-                            self.ast.MultipleSubstStatement(
-                                s.prefix,
-                                glyph,
-                                s.suffix,
-                                [replacements[i]],
-                                s.forceChain,
-                                location=s.location,
-                            )
-                        )
-                else:
-                    statements.append(s)
-            block.statements = statements
-
     def is_cur_keyword_(self, k):
         if self.cur_token_type_ is Lexer.NAME:
             if isinstance(k, type("")):  # basestring is gone in Python3

fontTools/fontBuilder.py

@@ -714,6 +714,12 @@ class FontBuilder(object):
         gvar.reserved = 0
         gvar.variations = variations
 
+    def setupGVAR(self, variations):
+        gvar = self.font["GVAR"] = newTable("GVAR")
+        gvar.version = 1
+        gvar.reserved = 0
+        gvar.variations = variations
+
     def calcGlyphBounds(self):
         """Calculate the bounding boxes of all glyphs in the `glyf` table.
         This is usually not called explicitly by client code.