fonttools 4.59.2__cp311-cp311-win32.whl → 4.60.1__cp311-cp311-win32.whl

fontTools/pens/pointPen.py

@@ -17,6 +17,7 @@ from __future__ import annotations
 import math
 from typing import Any, Dict, List, Optional, Tuple
 
+from fontTools.misc.enumTools import StrEnum
 from fontTools.misc.loggingTools import LogMixin
 from fontTools.misc.transform import DecomposedTransform, Identity
 from fontTools.pens.basePen import AbstractPen, MissingComponentError, PenError
@@ -28,6 +29,7 @@ __all__ = [
     "SegmentToPointPen",
     "GuessSmoothPointPen",
     "ReverseContourPointPen",
+    "ReverseFlipped",
 ]
 
 # Some type aliases to make it easier below
@@ -39,6 +41,19 @@ SegmentType = Optional[str]
 SegmentList = List[Tuple[SegmentType, SegmentPointList]]
 
 
+class ReverseFlipped(StrEnum):
+    """How to handle flipped components during decomposition.
+
+    NO: Don't reverse flipped components
+    KEEP_START: Reverse flipped components, keeping original starting point
+    ON_CURVE_FIRST: Reverse flipped components, ensuring first point is on-curve
+    """
+
+    NO = "no"
+    KEEP_START = "keep_start"
+    ON_CURVE_FIRST = "on_curve_first"
+
+
 class AbstractPointPen:
     """Baseclass for all PointPens."""
 
@@ -559,15 +574,20 @@ class DecomposingPointPen(LogMixin, AbstractPointPen):
         glyphSet,
         *args,
         skipMissingComponents=None,
-        reverseFlipped=False,
+        reverseFlipped: bool | ReverseFlipped = False,
         **kwargs,
     ):
         """Takes a 'glyphSet' argument (dict), in which the glyphs that are referenced
         as components are looked up by their name.
 
-        If the optional 'reverseFlipped' argument is True, components whose transformation
-        matrix has a negative determinant will be decomposed with a reversed path direction
-        to compensate for the flip.
+        If the optional 'reverseFlipped' argument is True or a ReverseFlipped enum value,
+        components whose transformation matrix has a negative determinant will be decomposed
+        with a reversed path direction to compensate for the flip.
+
+        The reverseFlipped parameter can be:
+        - False or ReverseFlipped.NO: Don't reverse flipped components
+        - True or ReverseFlipped.KEEP_START: Reverse, keeping original starting point
+        - ReverseFlipped.ON_CURVE_FIRST: Reverse, ensuring first point is on-curve
 
         The optional 'skipMissingComponents' argument can be set to True/False to
         override the homonymous class attribute for a given pen instance.
@@ -579,7 +599,13 @@ class DecomposingPointPen(LogMixin, AbstractPointPen):
             if skipMissingComponents is None
             else skipMissingComponents
         )
-        self.reverseFlipped = reverseFlipped
+        # Handle backward compatibility and validate string inputs
+        if reverseFlipped is False:
+            self.reverseFlipped = ReverseFlipped.NO
+        elif reverseFlipped is True:
+            self.reverseFlipped = ReverseFlipped.KEEP_START
+        else:
+            self.reverseFlipped = ReverseFlipped(reverseFlipped)
 
     def addComponent(self, baseGlyphName, transformation, identifier=None, **kwargs):
         """Transform the points of the base glyph and draw it onto self.
@@ -600,10 +626,18 @@ class DecomposingPointPen(LogMixin, AbstractPointPen):
             pen = self
             if transformation != Identity:
                 pen = TransformPointPen(pen, transformation)
-            if self.reverseFlipped:
+            if self.reverseFlipped != ReverseFlipped.NO:
                 # if the transformation has a negative determinant, it will
                 # reverse the contour direction of the component
                 a, b, c, d = transformation[:4]
                 if a * d - b * c < 0:
                     pen = ReverseContourPointPen(pen)
+
+                    if self.reverseFlipped == ReverseFlipped.ON_CURVE_FIRST:
+                        from fontTools.pens.filterPen import OnCurveFirstPointPen
+
+                        # Ensure the starting point is an on-curve.
+                        # Wrap last so this filter runs first during drawPoints
+                        pen = OnCurveFirstPointPen(pen)
+
             glyph.drawPoints(pen)

fontTools/qu2cu/qu2cu.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.1.3 */
+/* Generated by Cython 3.1.4 */
 
 /* BEGIN: Cython Metadata
 {
@@ -32,8 +32,8 @@ END: Cython Metadata */
 #elif PY_VERSION_HEX < 0x03080000
     #error Cython requires Python 3.8+.
 #else
-#define __PYX_ABI_VERSION "3_1_3"
-#define CYTHON_HEX_VERSION 0x030103F0
+#define __PYX_ABI_VERSION "3_1_4"
+#define CYTHON_HEX_VERSION 0x030104F0
 #define CYTHON_FUTURE_DIVISION 1
 /* CModulePreamble */
 #include <stddef.h>
@@ -3887,8 +3887,12 @@ static PyObject *__pyx_f_9fontTools_5qu2cu_5qu2cu_merge_curves(PyObject *__pyx_v
   __pyx_t_14 = __Pyx_c_diff_double(__pyx_v_p1, __pyx_v_p0);
   __pyx_t_7 = __pyx_PyComplex_FromComplex(__pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 146, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
-  __pyx_t_9 = (__Pyx_PyList_GET_SIZE(__pyx_v_ts) != 0);
-  if (unlikely(((!CYTHON_ASSUME_SAFE_MACROS) && __pyx_t_9 < 0))) __PYX_ERR(0, 146, __pyx_L1_error)
+  {
+    Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_v_ts);
+    if (unlikely(((!CYTHON_ASSUME_SAFE_SIZE) && __pyx_temp < 0))) __PYX_ERR(0, 146, __pyx_L1_error)
+    __pyx_t_9 = (__pyx_temp != 0);
+  }
+
   if (__pyx_t_9) {
     __pyx_t_1 = __Pyx_GetItemInt_List(__pyx_v_ts, 0, long, 1, __Pyx_PyLong_From_long, 1, 0, 1, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 146, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
@@ -3922,8 +3926,12 @@ static PyObject *__pyx_f_9fontTools_5qu2cu_5qu2cu_merge_curves(PyObject *__pyx_v
   __pyx_t_14 = __Pyx_c_diff_double(__pyx_v_p2, __pyx_v_p3);
   __pyx_t_1 = __pyx_PyComplex_FromComplex(__pyx_t_14); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 147, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_9 = (__Pyx_PyList_GET_SIZE(__pyx_v_ts) != 0);
-  if (unlikely(((!CYTHON_ASSUME_SAFE_MACROS) && __pyx_t_9 < 0))) __PYX_ERR(0, 147, __pyx_L1_error)
+  {
+    Py_ssize_t __pyx_temp = __Pyx_PyList_GET_SIZE(__pyx_v_ts);
+    if (unlikely(((!CYTHON_ASSUME_SAFE_SIZE) && __pyx_temp < 0))) __PYX_ERR(0, 147, __pyx_L1_error)
+    __pyx_t_9 = (__pyx_temp != 0);
+  }
+
   if (__pyx_t_9) {
     __pyx_t_7 = __Pyx_GetItemInt_List(__pyx_v_ts, -1L, long, 1, __Pyx_PyLong_From_long, 1, 1, 1, 1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 147, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_7);
@@ -9031,15 +9039,16 @@ static int __Pyx_InitConstants(__pyx_mstatetype *__pyx_mstate) {
   return -1;
 }
 /* #### Code section: init_codeobjects ### */
-typedef struct {
-    unsigned int argcount : 3;
-    unsigned int num_posonly_args : 1;
-    unsigned int num_kwonly_args : 1;
-    unsigned int nlocals : 6;
-    unsigned int flags : 10;
-    unsigned int first_line : 9;
-    unsigned int line_table_length : 15;
-} __Pyx_PyCode_New_function_description;
+\
+        typedef struct {
+            unsigned int argcount : 3;
+            unsigned int num_posonly_args : 1;
+            unsigned int num_kwonly_args : 1;
+            unsigned int nlocals : 6;
+            unsigned int flags : 10;
+            unsigned int first_line : 9;
+            unsigned int line_table_length : 15;
+        } __Pyx_PyCode_New_function_description;
 /* NewCodeObj.proto */
 static PyObject* __Pyx_PyCode_New(
         const __Pyx_PyCode_New_function_description descr,
@@ -12270,6 +12279,7 @@ static int __pyx_CommonTypesMetaclass_init(PyObject *module) {
         return -1;
     }
     mstate->__pyx_CommonTypesMetaclassType = __Pyx_FetchCommonTypeFromSpec(NULL, module, &__pyx_CommonTypesMetaclass_spec, bases);
+    Py_DECREF(bases);
     if (unlikely(mstate->__pyx_CommonTypesMetaclassType == NULL)) {
         return -1;
     }
@@ -16097,6 +16107,10 @@ static int __Pyx_check_binary_version(unsigned long ct_version, unsigned long rt
         PyCode_NewWithPosOnlyArgs
       #endif
         (a, p, k, l, s, f, code, c, n, v, fv, cell, fn, name, name, fline, lnos, __pyx_mstate_global->__pyx_empty_bytes);
+    #if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030c00A1
+    if (likely(result))
+        result->_co_firsttraceable = 0;
+    #endif
     return result;
   }
 #elif PY_VERSION_HEX >= 0x030800B2 && !CYTHON_COMPILING_IN_PYPY

fontTools/subset/__init__.py

@@ -272,7 +272,7 @@ Font table options
   Specify (=), add to (+=) or exclude from (-=) the comma-separated
   set of tables that will be be dropped.
   By default, the following tables are dropped:
-  'BASE', 'JSTF', 'DSIG', 'EBDT', 'EBLC', 'EBSC', 'PCLT', 'LTSH'
+  'JSTF', 'DSIG', 'EBDT', 'EBLC', 'EBSC', 'PCLT', 'LTSH'
   and Graphite tables: 'Feat', 'Glat', 'Gloc', 'Silf', 'Sill'.
   The tool will attempt to subset the remaining tables.
 
@@ -827,13 +827,26 @@ def subset_glyphs(self, s):
             self.MarkArray.MarkRecord, mark_indices
         )
         self.MarkArray.MarkCount = len(self.MarkArray.MarkRecord)
-        base_indices = self.BaseCoverage.subset(s.glyphs)
+        class_indices = _uniq_sort(v.Class for v in self.MarkArray.MarkRecord)
+
+        intersect_base_indices = self.BaseCoverage.intersect(s.glyphs)
+        base_records = self.BaseArray.BaseRecord
+        num_base_records = len(base_records)
+        base_indices = [
+            i
+            for i in intersect_base_indices
+            if i < num_base_records
+            and any(base_records[i].BaseAnchor[j] is not None for j in class_indices)
+        ]
+        if not base_indices:
+            return False
+
+        self.BaseCoverage.remap(base_indices)
         self.BaseArray.BaseRecord = _list_subset(
             self.BaseArray.BaseRecord, base_indices
         )
         self.BaseArray.BaseCount = len(self.BaseArray.BaseRecord)
         # Prune empty classes
-        class_indices = _uniq_sort(v.Class for v in self.MarkArray.MarkRecord)
         self.ClassCount = len(class_indices)
         for m in self.MarkArray.MarkRecord:
             m.Class = class_indices.index(m.Class)
@@ -867,13 +880,31 @@ def subset_glyphs(self, s):
             self.MarkArray.MarkRecord, mark_indices
         )
         self.MarkArray.MarkCount = len(self.MarkArray.MarkRecord)
-        ligature_indices = self.LigatureCoverage.subset(s.glyphs)
+        class_indices = _uniq_sort(v.Class for v in self.MarkArray.MarkRecord)
+
+        intersect_ligature_indices = self.LigatureCoverage.intersect(s.glyphs)
+        ligature_array = self.LigatureArray.LigatureAttach
+        num_ligatures = self.LigatureArray.LigatureCount
+
+        ligature_indices = [
+            i
+            for i in intersect_ligature_indices
+            if i < num_ligatures
+            and any(
+                any(component.LigatureAnchor[j] is not None for j in class_indices)
+                for component in ligature_array[i].ComponentRecord
+            )
+        ]
+
+        if not ligature_indices:
+            return False
+
+        self.LigatureCoverage.remap(ligature_indices)
         self.LigatureArray.LigatureAttach = _list_subset(
             self.LigatureArray.LigatureAttach, ligature_indices
         )
         self.LigatureArray.LigatureCount = len(self.LigatureArray.LigatureAttach)
         # Prune empty classes
-        class_indices = _uniq_sort(v.Class for v in self.MarkArray.MarkRecord)
         self.ClassCount = len(class_indices)
         for m in self.MarkArray.MarkRecord:
             m.Class = class_indices.index(m.Class)
@@ -915,13 +946,26 @@ def subset_glyphs(self, s):
             self.Mark1Array.MarkRecord, mark1_indices
         )
         self.Mark1Array.MarkCount = len(self.Mark1Array.MarkRecord)
-        mark2_indices = self.Mark2Coverage.subset(s.glyphs)
+        class_indices = _uniq_sort(v.Class for v in self.Mark1Array.MarkRecord)
+
+        intersect_mark2_indices = self.Mark2Coverage.intersect(s.glyphs)
+        mark2_records = self.Mark2Array.Mark2Record
+        num_mark2_records = len(mark2_records)
+        mark2_indices = [
+            i
+            for i in intersect_mark2_indices
+            if i < num_mark2_records
+            and any(mark2_records[i].Mark2Anchor[j] is not None for j in class_indices)
+        ]
+        if not mark2_indices:
+            return False
+
+        self.Mark2Coverage.remap(mark2_indices)
         self.Mark2Array.Mark2Record = _list_subset(
             self.Mark2Array.Mark2Record, mark2_indices
         )
         self.Mark2Array.MarkCount = len(self.Mark2Array.Mark2Record)
         # Prune empty classes
-        class_indices = _uniq_sort(v.Class for v in self.Mark1Array.MarkRecord)
         self.ClassCount = len(class_indices)
         for m in self.Mark1Array.MarkRecord:
             m.Class = class_indices.index(m.Class)
@@ -1717,6 +1761,19 @@ def subset_features(self, feature_indices):
     return bool(self.SubstitutionCount)
 
 
+@_add_method(otTables.FeatureTableSubstitution)
+def prune_features(self, feature_index_map):
+    self.ensureDecompiled()
+    self.SubstitutionRecord = [
+        r for r in self.SubstitutionRecord if r.FeatureIndex in feature_index_map.keys()
+    ]
+    # remap feature indices
+    for r in self.SubstitutionRecord:
+        r.FeatureIndex = feature_index_map[r.FeatureIndex]
+    self.SubstitutionCount = len(self.SubstitutionRecord)
+    return bool(self.SubstitutionCount)
+
+
 @_add_method(otTables.FeatureVariations)
 def subset_features(self, feature_indices):
     self.ensureDecompiled()
@@ -1735,6 +1792,24 @@ def subset_features(self, feature_indices):
     return bool(self.FeatureVariationCount)
 
 
+@_add_method(otTables.FeatureVariations)
+def prune_features(self, feature_index_map):
+    self.ensureDecompiled()
+    for r in self.FeatureVariationRecord:
+        r.FeatureTableSubstitution.prune_features(feature_index_map)
+    # Prune empty records at the end only
+    # https://github.com/fonttools/fonttools/issues/1881
+    while (
+        self.FeatureVariationRecord
+        and not self.FeatureVariationRecord[
+            -1
+        ].FeatureTableSubstitution.SubstitutionCount
+    ):
+        self.FeatureVariationRecord.pop()
+    self.FeatureVariationCount = len(self.FeatureVariationRecord)
+    return bool(self.FeatureVariationCount)
+
+
 @_add_method(otTables.DefaultLangSys, otTables.LangSys)
 def subset_features(self, feature_indices):
     if self.ReqFeatureIndex in feature_indices:
@@ -1750,6 +1825,16 @@ def subset_features(self, feature_indices):
     return bool(self.FeatureCount or self.ReqFeatureIndex != 65535)
 
 
+@_add_method(otTables.DefaultLangSys, otTables.LangSys)
+def prune_features(self, feature_index_map):
+    self.ReqFeatureIndex = feature_index_map.get(self.ReqFeatureIndex, 65535)
+    self.FeatureIndex = [
+        feature_index_map[f] for f in self.FeatureIndex if f in feature_index_map.keys()
+    ]
+    self.FeatureCount = len(self.FeatureIndex)
+    return bool(self.FeatureCount or self.ReqFeatureIndex != 65535)
+
+
 @_add_method(otTables.DefaultLangSys, otTables.LangSys)
 def collect_features(self):
     feature_indices = self.FeatureIndex[:]
@@ -1773,6 +1858,21 @@ def subset_features(self, feature_indices, keepEmptyDefaultLangSys=False):
     return bool(self.LangSysCount or self.DefaultLangSys)
 
 
+@_add_method(otTables.Script)
+def prune_features(self, feature_index_map, keepEmptyDefaultLangSys=False):
+    if (
+        self.DefaultLangSys
+        and not self.DefaultLangSys.prune_features(feature_index_map)
+        and not keepEmptyDefaultLangSys
+    ):
+        self.DefaultLangSys = None
+    self.LangSysRecord = [
+        l for l in self.LangSysRecord if l.LangSys.prune_features(feature_index_map)
+    ]
+    self.LangSysCount = len(self.LangSysRecord)
+    return bool(self.LangSysCount or self.DefaultLangSys)
+
+
 @_add_method(otTables.Script)
 def collect_features(self):
     feature_indices = [l.LangSys.collect_features() for l in self.LangSysRecord]
@@ -1794,6 +1894,19 @@ def subset_features(self, feature_indices, retain_empty):
     return bool(self.ScriptCount)
 
 
+@_add_method(otTables.ScriptList)
+def prune_features(self, feature_index_map, retain_empty):
+    # https://bugzilla.mozilla.org/show_bug.cgi?id=1331737#c32
+    self.ScriptRecord = [
+        s
+        for s in self.ScriptRecord
+        if s.Script.prune_features(feature_index_map, s.ScriptTag == "DFLT")
+        or retain_empty
+    ]
+    self.ScriptCount = len(self.ScriptRecord)
+    return bool(self.ScriptCount)
+
+
 @_add_method(otTables.ScriptList)
 def collect_features(self):
     return _uniq_sort(sum((s.Script.collect_features() for s in self.ScriptRecord), []))
@@ -1981,21 +2094,74 @@ def subset_script_tags(self, tags):
 
 @_add_method(ttLib.getTableClass("GSUB"), ttLib.getTableClass("GPOS"))
 def prune_features(self):
-    """Remove unreferenced features"""
+    """Remove unreferenced and duplicate features in FeatureList
+    Remove unreferenced features and remap duplicate feature indices in ScriptList and FeatureVariations
+    """
     if self.table.ScriptList:
         feature_indices = self.table.ScriptList.collect_features()
     else:
         feature_indices = []
+    (feature_indices, feature_index_map) = self.remap_duplicate_features(
+        feature_indices
+    )
+
     if self.table.FeatureList:
         self.table.FeatureList.subset_features(feature_indices)
     if getattr(self.table, "FeatureVariations", None):
-        self.table.FeatureVariations.subset_features(feature_indices)
+        self.table.FeatureVariations.prune_features(feature_index_map)
     if self.table.ScriptList:
-        self.table.ScriptList.subset_features(
-            feature_indices, self.retain_empty_scripts()
+        self.table.ScriptList.prune_features(
+            feature_index_map, self.retain_empty_scripts()
         )
 
 
+@_add_method(ttLib.getTableClass("GSUB"), ttLib.getTableClass("GPOS"))
+def remap_duplicate_features(self, feature_indices):
+    """Return retained feature indices(without duplicates) and remapped feature indices"""
+    features = self.table.FeatureList.FeatureRecord
+
+    unique_features = {}
+    duplicate_features = {}
+    for i in feature_indices:
+        f = features[i]
+        tag = f.FeatureTag
+
+        same_tag_features = unique_features.get(tag)
+        if same_tag_features is None:
+            unique_features[tag] = set([i])
+            duplicate_features[i] = i
+            continue
+
+        found = False
+        for other_i in same_tag_features:
+            if features[other_i] == f:
+                found = True
+                duplicate_features[i] = other_i
+                break
+
+        if not found:
+            same_tag_features.add(i)
+            duplicate_features[i] = i
+
+    ## remap retained feature indices
+    feature_map = {}
+    new_idx = 0
+
+    for i in feature_indices:
+        unique_i = duplicate_features.get(i, i)
+        v = feature_map.get(unique_i)
+        if v is None:
+            feature_map[i] = new_idx
+            new_idx += 1
+        else:
+            feature_map[i] = v
+
+    retained_feature_indices = _uniq_sort(
+        sum((list(s) for s in unique_features.values()), [])
+    )
+    return (retained_feature_indices, feature_map)
+
+
 @_add_method(ttLib.getTableClass("GSUB"), ttLib.getTableClass("GPOS"))
 def prune_pre_subset(self, font, options):
     # Drop undesired features
@@ -3145,7 +3311,6 @@ class Options(object):
 
     # spaces in tag names (e.g. "SVG ", "cvt ") are stripped by the argument parser
     _drop_tables_default = [
-        "BASE",
         "JSTF",
         "DSIG",
         "EBDT",
@@ -3157,6 +3322,7 @@ class Options(object):
     _drop_tables_default += ["Feat", "Glat", "Gloc", "Silf", "Sill"]  # Graphite
     _no_subset_tables_default = [
         "avar",
+        "BASE",
         "fvar",
         "gasp",
         "head",

fontTools/ttLib/tables/_p_o_s_t.py

@@ -118,6 +118,7 @@ class table__p_o_s_t(DefaultTable.DefaultTable):
     def build_psNameMapping(self, ttFont):
         mapping = {}
         allNames = {}
+        glyphOrderNames = set(self.glyphOrder)
         for i in range(ttFont["maxp"].numGlyphs):
             glyphName = psName = self.glyphOrder[i]
             if glyphName == "":
@@ -126,16 +127,15 @@ class table__p_o_s_t(DefaultTable.DefaultTable):
             if glyphName in allNames:
                 # make up a new glyphName that's unique
                 n = allNames[glyphName]
-                # check if the exists in any of the seen names or later ones
-                names = set(allNames.keys()) | set(self.glyphOrder)
-                while (glyphName + "." + str(n)) in names:
+                # check if the glyph name exists in the glyph order
+                while f"{glyphName}.{n}" in glyphOrderNames:
                     n += 1
                 allNames[glyphName] = n + 1
-                glyphName = glyphName + "." + str(n)
+                glyphName = f"{glyphName}.{n}"
 
-            self.glyphOrder[i] = glyphName
             allNames[glyphName] = 1
             if glyphName != psName:
+                self.glyphOrder[i] = glyphName
                 mapping[glyphName] = psName
 
         self.mapping = mapping