fonttools 4.57.0__cp312-cp312-win_amd64.whl → 4.58.1__cp312-cp312-win_amd64.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.

fontTools/merge/cmap.py

@@ -54,6 +54,28 @@ def _glyphsAreSame(
     return True
 
 
+def computeMegaUvs(merger, uvsTables):
+    """Returns merged UVS subtable (cmap format=14)."""
+    uvsDict = {}
+    cmap = merger.cmap
+    for table in uvsTables:
+        for variationSelector, uvsMapping in table.uvsDict.items():
+            if variationSelector not in uvsDict:
+                uvsDict[variationSelector] = {}
+            for unicodeValue, glyphName in uvsMapping:
+                if cmap.get(unicodeValue) == glyphName:
+                    # this is a default variation
+                    glyphName = None
+                    # prefer previous glyph id if both fonts defined UVS
+                if unicodeValue not in uvsDict[variationSelector]:
+                    uvsDict[variationSelector][unicodeValue] = glyphName
+
+    for variationSelector in uvsDict:
+        uvsDict[variationSelector] = [*uvsDict[variationSelector].items()]
+
+    return uvsDict
+
+
 # Valid (format, platformID, platEncID) triplets for cmap subtables containing
 # Unicode BMP-only and Unicode Full Repertoire semantics.
 # Cf. OpenType spec for "Platform specific encodings":
@@ -61,24 +83,29 @@ def _glyphsAreSame(
 class _CmapUnicodePlatEncodings:
     BMP = {(4, 3, 1), (4, 0, 3), (4, 0, 4), (4, 0, 6)}
     FullRepertoire = {(12, 3, 10), (12, 0, 4), (12, 0, 6)}
+    UVS = {(14, 0, 5)}
 
 
 def computeMegaCmap(merger, cmapTables):
-    """Sets merger.cmap and merger.glyphOrder."""
+    """Sets merger.cmap and merger.uvsDict."""
 
     # TODO Handle format=14.
     # Only merge format 4 and 12 Unicode subtables, ignores all other subtables
     # If there is a format 12 table for a font, ignore the format 4 table of it
     chosenCmapTables = []
+    chosenUvsTables = []
     for fontIdx, table in enumerate(cmapTables):
         format4 = None
         format12 = None
+        format14 = None
         for subtable in table.tables:
             properties = (subtable.format, subtable.platformID, subtable.platEncID)
             if properties in _CmapUnicodePlatEncodings.BMP:
                 format4 = subtable
             elif properties in _CmapUnicodePlatEncodings.FullRepertoire:
                 format12 = subtable
+            elif properties in _CmapUnicodePlatEncodings.UVS:
+                format14 = subtable
             else:
                 log.warning(
                     "Dropped cmap subtable from font '%s':\t"
@@ -93,6 +120,9 @@ def computeMegaCmap(merger, cmapTables):
         elif format4 is not None:
             chosenCmapTables.append((format4, fontIdx))
 
+        if format14 is not None:
+            chosenUvsTables.append(format14)
+
     # Build the unicode mapping
     merger.cmap = cmap = {}
     fontIndexForGlyph = {}
@@ -127,6 +157,8 @@ def computeMegaCmap(merger, cmapTables):
                         "Dropped mapping from codepoint %#06X to glyphId '%s'", uni, gid
                     )
 
+    merger.uvsDict = computeMegaUvs(merger, chosenUvsTables)
+
 
 def renameCFFCharStrings(merger, glyphOrder, cffTable):
     """Rename topDictIndex charStrings based on glyphOrder."""

fontTools/merge/tables.py

@@ -312,7 +312,6 @@ def merge(self, m, tables):
 
 @add_method(ttLib.getTableClass("cmap"))
 def merge(self, m, tables):
-    # TODO Handle format=14.
     if not hasattr(m, "cmap"):
         computeMegaCmap(m, tables)
     cmap = m.cmap
@@ -336,6 +335,18 @@ def merge(self, m, tables):
     cmapTable.cmap = cmapBmpOnly
     # ordered by platform then encoding
     self.tables.insert(0, cmapTable)
+
+    uvsDict = m.uvsDict
+    if uvsDict:
+        # format-14
+        uvsTable = module.cmap_classes[14](14)
+        uvsTable.platformID = 0
+        uvsTable.platEncID = 5
+        uvsTable.language = 0
+        uvsTable.cmap = {}
+        uvsTable.uvsDict = uvsDict
+        # ordered by platform then encoding
+        self.tables.insert(0, uvsTable)
     self.tableVersion = 0
     self.numSubTables = len(self.tables)
     return self