fonttools 4.55.4__cp313-cp313-musllinux_1_2_aarch64.whl → 4.61.1__cp313-cp313-musllinux_1_2_aarch64.whl

fontTools/__init__.py

@@ -3,6 +3,6 @@ from fontTools.misc.loggingTools import configLogger
 
 log = logging.getLogger(__name__)
 
-version = __version__ = "4.55.4"
+version = __version__ = "4.61.1"
 
 __all__ = ["version", "log", "configLogger"]

fontTools/annotations.py

@@ -0,0 +1,30 @@
+from __future__ import annotations
+from typing import TYPE_CHECKING, Iterable, Optional, TypeVar, Union
+from collections.abc import Callable, Sequence
+from fontTools.misc.filesystem._base import FS
+from os import PathLike
+from xml.etree.ElementTree import Element as ElementTreeElement
+
+if TYPE_CHECKING:
+    from fontTools.ufoLib import UFOFormatVersion
+    from fontTools.ufoLib.glifLib import GLIFFormatVersion
+    from lxml.etree import _Element as LxmlElement
+
+
+T = TypeVar("T")  # Generic type
+K = TypeVar("K")  # Generic dict key type
+V = TypeVar("V")  # Generic dict value type
+
+GlyphNameToFileNameFunc = Optional[Callable[[str, set[str]], str]]
+ElementType = Union[ElementTreeElement, "LxmlElement"]
+FormatVersion = Union[int, tuple[int, int]]
+FormatVersions = Optional[Iterable[FormatVersion]]
+GLIFFormatVersionInput = Optional[Union[int, tuple[int, int], "GLIFFormatVersion"]]
+UFOFormatVersionInput = Optional[Union[int, tuple[int, int], "UFOFormatVersion"]]
+IntFloat = Union[int, float]
+KerningPair = tuple[str, str]
+KerningDict = dict[KerningPair, IntFloat]
+KerningGroups = dict[str, Sequence[str]]
+KerningNested = dict[str, dict[str, IntFloat]]
+PathStr = Union[str, PathLike[str]]
+PathOrFS = Union[PathStr, FS]

fontTools/cffLib/CFF2ToCFF.py

@@ -2,13 +2,17 @@
 
 from fontTools.ttLib import TTFont, newTable
 from fontTools.misc.cliTools import makeOutputFileName
+from fontTools.misc.psCharStrings import T2StackUseExtractor
 from fontTools.cffLib import (
     TopDictIndex,
     buildOrder,
     buildDefaults,
     topDictOperators,
     privateDictOperators,
+    FDSelect,
 )
+from .transforms import desubroutinizeCharString
+from .specializer import specializeProgram
 from .width import optimizeWidths
 from collections import defaultdict
 import logging
@@ -27,7 +31,7 @@ def _convertCFF2ToCFF(cff, otFont):
     The CFF2 font cannot be variable. (TODO Accept those and convert to the
     default instance?)
 
-    This assumes a decompiled CFF table. (i.e. that the object has been
+    This assumes a decompiled CFF2 table. (i.e. that the object has been
     filled via :meth:`decompile` and e.g. not loaded from XML.)"""
 
     cff.major = 1
@@ -51,9 +55,14 @@ def _convertCFF2ToCFF(cff, otFont):
             if hasattr(topDict, key):
                 delattr(topDict, key)
 
-    fdArray = topDict.FDArray
     charStrings = topDict.CharStrings
 
+    fdArray = topDict.FDArray
+    if not hasattr(topDict, "FDSelect"):
+        # FDSelect is optional in CFF2, but required in CFF.
+        fdSelect = topDict.FDSelect = FDSelect()
+        fdSelect.gidArray = [0] * len(charStrings.charStrings)
+
     defaults = buildDefaults(privateDictOperators)
     order = buildOrder(privateDictOperators)
     for fd in fdArray:
@@ -69,6 +78,7 @@ def _convertCFF2ToCFF(cff, otFont):
                 if hasattr(privateDict, key):
                     delattr(privateDict, key)
 
+    # Add ending operators
     for cs in charStrings.values():
         cs.decompile()
         cs.program.append("endchar")
@@ -100,23 +110,43 @@ def _convertCFF2ToCFF(cff, otFont):
         if width != private.defaultWidthX:
             cs.program.insert(0, width - private.nominalWidthX)
 
+    # Handle stack use since stack-depth is lower in CFF than in CFF2.
+    for glyphName in charStrings.keys():
+        cs, fdIndex = charStrings.getItemAndSelector(glyphName)
+        if fdIndex is None:
+            fdIndex = 0
+        private = fdArray[fdIndex].Private
+        extractor = T2StackUseExtractor(
+            getattr(private, "Subrs", []), cff.GlobalSubrs, private=private
+        )
+        stackUse = extractor.execute(cs)
+        if stackUse > 48:  # CFF stack depth is 48
+            desubroutinizeCharString(cs)
+            cs.program = specializeProgram(cs.program)
+
+    # Unused subroutines are still in CFF2 (ie. lacking 'return' operator)
+    # because they were not decompiled when we added the 'return'.
+    # Moreover, some used subroutines may have become unused after the
+    # stack-use fixup. So we remove all unused subroutines now.
+    cff.remove_unused_subroutines()
+
     mapping = {
-        name: ("cid" + str(n) if n else ".notdef")
+        name: ("cid" + str(n).zfill(5) if n else ".notdef")
         for n, name in enumerate(topDict.charset)
     }
     topDict.charset = [
-        "cid" + str(n) if n else ".notdef" for n in range(len(topDict.charset))
+        "cid" + str(n).zfill(5) if n else ".notdef" for n in range(len(topDict.charset))
     ]
     charStrings.charStrings = {
         mapping[name]: v for name, v in charStrings.charStrings.items()
     }
 
-    # I'm not sure why the following is *not* necessary. And it breaks
-    # the output if I add it.
-    # topDict.ROS = ("Adobe", "Identity", 0)
+    topDict.ROS = ("Adobe", "Identity", 0)
 
 
 def convertCFF2ToCFF(font, *, updatePostTable=True):
+    if "CFF2" not in font:
+        raise ValueError("Input font does not contain a CFF2 table.")
     cff = font["CFF2"].cff
     _convertCFF2ToCFF(cff, font)
     del font["CFF2"]
@@ -131,7 +161,7 @@ def convertCFF2ToCFF(font, *, updatePostTable=True):
 
 
 def main(args=None):
-    """Convert CFF OTF font to CFF2 OTF font"""
+    """Convert CFF2 OTF font to CFF OTF font"""
     if args is None:
         import sys
 
@@ -140,8 +170,8 @@ def main(args=None):
     import argparse
 
     parser = argparse.ArgumentParser(
-        "fonttools cffLib.CFFToCFF2",
-        description="Upgrade a CFF font to CFF2.",
+        "fonttools cffLib.CFF2ToCFF",
+        description="Convert a non-variable CFF2 font to CFF.",
     )
     parser.add_argument(
         "input", metavar="INPUT.ttf", help="Input OTF file with CFF table."
@@ -159,6 +189,16 @@ def main(args=None):
         action="store_false",
         help="Don't set the output font's timestamp to the current time.",
     )
+    parser.add_argument(
+        "--remove-overlaps",
+        action="store_true",
+        help="Merge overlapping contours and components. Requires skia-pathops",
+    )
+    parser.add_argument(
+        "--ignore-overlap-errors",
+        action="store_true",
+        help="Don't crash if the remove-overlaps operation fails for some glyphs.",
+    )
     loggingGroup = parser.add_mutually_exclusive_group(required=False)
     loggingGroup.add_argument(
         "-v", "--verbose", action="store_true", help="Run more verbosely."
@@ -190,6 +230,21 @@ def main(args=None):
 
     convertCFF2ToCFF(font)
 
+    if options.remove_overlaps:
+        from fontTools.ttLib.removeOverlaps import removeOverlaps
+        from io import BytesIO
+
+        log.debug("Removing overlaps")
+
+        stream = BytesIO()
+        font.save(stream)
+        stream.seek(0)
+        font = TTFont(stream, recalcTimestamp=False, recalcBBoxes=False)
+        removeOverlaps(
+            font,
+            ignoreErrors=options.ignore_overlap_errors,
+        )
+
     log.info(
         "Saving %s",
         outfile,

fontTools/cffLib/__init__.py

@@ -1464,10 +1464,11 @@ class CharsetConverter(SimpleConverter):
                 if glyphName in allNames:
                     # make up a new glyphName that's unique
                     n = allNames[glyphName]
-                    while (glyphName + "#" + str(n)) in allNames:
+                    names = set(allNames) | set(charset)
+                    while (glyphName + "." + str(n)) in names:
                         n += 1
                     allNames[glyphName] = n + 1
-                    glyphName = glyphName + "#" + str(n)
+                    glyphName = glyphName + "." + str(n)
                 allNames[glyphName] = 1
                 newCharset.append(glyphName)
             charset = newCharset
@@ -1663,25 +1664,26 @@ class EncodingConverter(SimpleConverter):
             return "StandardEncoding"
         elif value == 1:
             return "ExpertEncoding"
+        # custom encoding at offset `value`
+        assert value > 1
+        file = parent.file
+        file.seek(value)
+        log.log(DEBUG, "loading Encoding at %s", value)
+        fmt = readCard8(file)
+        haveSupplement = bool(fmt & 0x80)
+        fmt = fmt & 0x7F
+
+        if fmt == 0:
+            encoding = parseEncoding0(parent.charset, file)
+        elif fmt == 1:
+            encoding = parseEncoding1(parent.charset, file)
         else:
-            assert value > 1
-            file = parent.file
-            file.seek(value)
-            log.log(DEBUG, "loading Encoding at %s", value)
-            fmt = readCard8(file)
-            haveSupplement = fmt & 0x80
-            if haveSupplement:
-                raise NotImplementedError("Encoding supplements are not yet supported")
-            fmt = fmt & 0x7F
-            if fmt == 0:
-                encoding = parseEncoding0(
-                    parent.charset, file, haveSupplement, parent.strings
-                )
-            elif fmt == 1:
-                encoding = parseEncoding1(
-                    parent.charset, file, haveSupplement, parent.strings
-                )
-            return encoding
+            raise ValueError(f"Unknown Encoding format: {fmt}")
+
+        if haveSupplement:
+            parseEncodingSupplement(file, encoding, parent.strings)
+
+        return encoding
 
     def write(self, parent, value):
         if value == "StandardEncoding":
@@ -1719,27 +1721,60 @@ class EncodingConverter(SimpleConverter):
         return encoding
 
 
-def parseEncoding0(charset, file, haveSupplement, strings):
+def readSID(file):
+    """Read a String ID (SID) — 2-byte unsigned integer."""
+    data = file.read(2)
+    if len(data) != 2:
+        raise EOFError("Unexpected end of file while reading SID")
+    return struct.unpack(">H", data)[0]  # big-endian uint16
+
+
+def parseEncodingSupplement(file, encoding, strings):
+    """
+    Parse the CFF Encoding supplement data:
+      - nSups: number of supplementary mappings
+      - each mapping: (code, SID) pair
+    and apply them to the `encoding` list in place.
+    """
+    nSups = readCard8(file)
+    for _ in range(nSups):
+        code = readCard8(file)
+        sid = readSID(file)
+        name = strings[sid]
+        encoding[code] = name
+
+
+def parseEncoding0(charset, file):
+    """
+    Format 0: simple list of codes.
+    After reading the base table, optionally parse the supplement.
+    """
     nCodes = readCard8(file)
     encoding = [".notdef"] * 256
     for glyphID in range(1, nCodes + 1):
         code = readCard8(file)
         if code != 0:
             encoding[code] = charset[glyphID]
+
     return encoding
 
 
-def parseEncoding1(charset, file, haveSupplement, strings):
+def parseEncoding1(charset, file):
+    """
+    Format 1: range-based encoding.
+    After reading the base ranges, optionally parse the supplement.
+    """
     nRanges = readCard8(file)
     encoding = [".notdef"] * 256
     glyphID = 1
-    for i in range(nRanges):
+    for _ in range(nRanges):
         code = readCard8(file)
         nLeft = readCard8(file)
-        for glyphID in range(glyphID, glyphID + nLeft + 1):
+        for _ in range(nLeft + 1):
             encoding[code] = charset[glyphID]
-            code = code + 1
-        glyphID = glyphID + 1
+            code += 1
+            glyphID += 1
+
     return encoding
 
 

fontTools/cffLib/specializer.py

@@ -580,7 +580,10 @@ def specializeCommands(
     for i in range(len(commands) - 1, 0, -1):
         if "rmoveto" == commands[i][0] == commands[i - 1][0]:
             v1, v2 = commands[i - 1][1], commands[i][1]
-            commands[i - 1] = ("rmoveto", [v1[0] + v2[0], v1[1] + v2[1]])
+            commands[i - 1] = (
+                "rmoveto",
+                [_addArgs(v1[0], v2[0]), _addArgs(v1[1], v2[1])],
+            )
             del commands[i]
 
     # 2. Specialize rmoveto/rlineto/rrcurveto operators into horizontal/vertical variants.

fontTools/cffLib/transforms.py

@@ -94,17 +94,22 @@ class _DesubroutinizingT2Decompiler(SimpleT2Decompiler):
             cs._patches.append((index, subr._desubroutinized))
 
 
+def desubroutinizeCharString(cs):
+    """Desubroutinize a charstring in-place."""
+    cs.decompile()
+    subrs = getattr(cs.private, "Subrs", [])
+    decompiler = _DesubroutinizingT2Decompiler(subrs, cs.globalSubrs, cs.private)
+    decompiler.execute(cs)
+    cs.program = cs._desubroutinized
+    del cs._desubroutinized
+
+
 def desubroutinize(cff):
     for fontName in cff.fontNames:
         font = cff[fontName]
         cs = font.CharStrings
         for c in cs.values():
-            c.decompile()
-            subrs = getattr(c.private, "Subrs", [])
-            decompiler = _DesubroutinizingT2Decompiler(subrs, c.globalSubrs, c.private)
-            decompiler.execute(c)
-            c.program = c._desubroutinized
-            del c._desubroutinized
+            desubroutinizeCharString(c)
         # Delete all the local subrs
         if hasattr(font, "FDArray"):
             for fd in font.FDArray:

fontTools/config/__init__.py

@@ -73,3 +73,18 @@ Config.register_option(
     parse=Option.parse_optional_bool,
     validate=Option.validate_optional_bool,
 )
+
+Config.register_option(
+    name="fontTools.ttLib:OPTIMIZE_FONT_SPEED",
+    help=dedent(
+        """\
+        Enable optimizations that prioritize speed over file size. This
+        mainly affects how glyf table and gvar / VARC tables are compiled.
+        The produced fonts will be larger, but rendering performance will
+        be improved with HarfBuzz and other text layout engines.
+        """
+    ),
+    default=False,
+    parse=Option.parse_optional_bool,
+    validate=Option.validate_optional_bool,
+)