fonttools 4.58.4__tar.gz → 4.58.5__tar.gz

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/__init__.py

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

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/feaLib/ast.py

@@ -1,3 +1,4 @@
+import weakref
 from fontTools.feaLib.error import FeatureLibError
 from fontTools.feaLib.location import FeatureLibLocation
 from fontTools.misc.encodingTools import getEncoding
@@ -529,7 +530,7 @@ class MarkClass(object):
     def addDefinition(self, definition):
         """Add a :class:`MarkClassDefinition` statement to this mark class."""
         assert isinstance(definition, MarkClassDefinition)
-        self.definitions.append(definition)
+        self.definitions.append(weakref.proxy(definition))
         for glyph in definition.glyphSet():
             if glyph in self.glyphs:
                 otherLoc = self.glyphs[glyph].location

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/feaLib/builder.py

@@ -259,12 +259,13 @@ class Builder(object):
             key = (script, lang, feature_name)
             self.features_.setdefault(key, []).append(lookup)
 
-    def get_lookup_(self, location, builder_class):
+    def get_lookup_(self, location, builder_class, mapping=None):
         if (
             self.cur_lookup_
             and type(self.cur_lookup_) == builder_class
             and self.cur_lookup_.lookupflag == self.lookupflag_
             and self.cur_lookup_.markFilterSet == self.lookupflag_markFilterSet_
+            and self.cur_lookup_.can_add_mapping(mapping)
         ):
             return self.cur_lookup_
         if self.cur_lookup_name_ and self.cur_lookup_:
@@ -1305,7 +1306,7 @@ class Builder(object):
     # GSUB rules
 
     def add_any_subst_(self, location, mapping):
-        lookup = self.get_lookup_(location, AnySubstBuilder)
+        lookup = self.get_lookup_(location, AnySubstBuilder, mapping=mapping)
         for key, value in mapping.items():
             if key in lookup.mapping:
                 if value == lookup.mapping[key]:

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/misc/visitor.py

@@ -1,11 +1,19 @@
 """Generic visitor pattern implementation for Python objects."""
 
 import enum
+import weakref
 
 
 class Visitor(object):
     defaultStop = False
 
+    _visitors = {
+        # By default we skip visiting weak references to avoid recursion
+        # issues. Users can override this by registering a visit
+        # function for weakref.ProxyType.
+        weakref.ProxyType: {None: lambda self, obj, *args, **kwargs: False}
+    }
+
     @classmethod
     def _register(celf, clazzes_attrs):
         assert celf != Visitor, "Subclass Visitor instead."

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/otlLib/builder.py

@@ -256,6 +256,10 @@ class LookupBuilder(object):
             )
         )
 
+    def can_add_mapping(self, _mapping) -> bool:
+        # used by AnySubstBuilder,  below
+        return True
+
 
 class AlternateSubstBuilder(LookupBuilder):
     """Builds an Alternate Substitution (GSUB3) lookup.
@@ -1376,6 +1380,32 @@ class AnySubstBuilder(LookupBuilder):
     def _add_to_ligature_subst(self, builder, key, value):
         builder.ligatures[key] = value[0]
 
+    def can_add_mapping(self, mapping) -> bool:
+        if mapping is None:
+            return True
+        # single sub rules can be treated as (degenerate) liga-or-multi sub
+        # rules, but multi and liga sub rules themselves have incompatible
+        # representations. It is uncommon that these are in the same set of
+        # rules, but it happens.
+        is_multi = any(len(v) > 1 for v in mapping.values())
+        is_liga = any(len(k) > 1 for k in mapping.keys())
+
+        has_existing_multi = False
+        has_existing_liga = False
+
+        for k, v in self.mapping.items():
+            if k[0] == self.SUBTABLE_BREAK_:
+                continue
+            if len(k) > 1:
+                has_existing_liga = True
+            if len(v) > 1:
+                has_existing_multi = True
+
+        can_reuse = not (has_existing_multi and is_liga) and not (
+            has_existing_liga and is_multi
+        )
+        return can_reuse
+
     def promote_lookup_type(self, is_named_lookup):
         # https://github.com/fonttools/fonttools/issues/612
         # A multiple substitution may have a single destination, in which case

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fontTools/varLib/instancer/__init__.py

@@ -723,9 +723,7 @@ def instantiateCFF2(
             minor = varDataCursor[major]
             varDataCursor[major] += 1
 
-            varIdx = (major << 16) + minor
-
-            defaultValue += round(defaultDeltas[varIdx])
+            defaultValue += round(defaultDeltas[major][minor])
             newDefaults.append(defaultValue)
 
             varData = varStore.VarData[major]
@@ -781,7 +779,9 @@ def instantiateCFF2(
                 storeBlendsToVarStore(value + [count])
 
     # Instantiate VarStore
-    defaultDeltas = instantiateItemVariationStore(varStore, fvarAxes, axisLimits)
+    defaultDeltas = instantiateItemVariationStore(
+        varStore, fvarAxes, axisLimits, hierarchical=True
+    )
 
     # Read back new charstring blends from the instantiated VarStore
     varDataCursor = [0] * len(varStore.VarData)
@@ -839,18 +839,13 @@ def instantiateCFF2(
         varData.Item = []
         varData.ItemCount = 0
 
-    # Remove vsindex commands that are no longer needed, collect those that are.
-    usedVsindex = set()
-    for commands in allCommands:
-        if any(isinstance(arg, list) for command in commands for arg in command[1]):
-            vsindex = 0
-            for command in commands:
-                if command[0] == "vsindex":
-                    vsindex = command[1][0]
-                    continue
-                if any(isinstance(arg, list) for arg in command[1]):
-                    usedVsindex.add(vsindex)
-        else:
+    # Collect surviving vsindexes
+    usedVsindex = set(
+        i for i in range(len(varStore.VarData)) if varStore.VarData[i].VarRegionCount
+    )
+    # Remove vsindex commands that are no longer needed
+    for commands, private in zip(allCommands, allCommandPrivates):
+        if not any(isinstance(arg, list) for command in commands for arg in command[1]):
             commands[:] = [command for command in commands if command[0] != "vsindex"]
 
     # Remove unused VarData and update vsindex values
@@ -863,10 +858,14 @@ def instantiateCFF2(
         for command in commands:
             if command[0] == "vsindex":
                 command[1][0] = vsindexMapping[command[1][0]]
+    for private in privateDicts:
+        if hasattr(private, "vsindex"):
+            private.vsindex = vsindexMapping[private.vsindex]
 
     # Remove initial vsindex commands that are implied
-    for commands in allCommands:
-        if commands and commands[0] == ("vsindex", [0]):
+    for commands, private in zip(allCommands, allCommandPrivates):
+        vsindex = getattr(private, "vsindex", 0)
+        if commands and commands[0] == ("vsindex", [vsindex]):
             commands.pop(0)
 
     # Ship the charstrings!
@@ -1247,7 +1246,9 @@ class _TupleVarStoreAdapter(object):
         return itemVarStore
 
 
-def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits):
+def instantiateItemVariationStore(
+    itemVarStore, fvarAxes, axisLimits, hierarchical=False
+):
     """Compute deltas at partial location, and update varStore in-place.
 
     Remove regions in which all axes were instanced, or fall outside the new axis
@@ -1279,12 +1280,19 @@ def instantiateItemVariationStore(itemVarStore, fvarAxes, axisLimits):
     assert itemVarStore.VarDataCount == newItemVarStore.VarDataCount
     itemVarStore.VarData = newItemVarStore.VarData
 
-    defaultDeltas = {
-        ((major << 16) + minor): delta
-        for major, deltas in enumerate(defaultDeltaArray)
-        for minor, delta in enumerate(deltas)
-    }
-    defaultDeltas[itemVarStore.NO_VARIATION_INDEX] = 0
+    if not hierarchical:
+        defaultDeltas = {
+            ((major << 16) + minor): delta
+            for major, deltas in enumerate(defaultDeltaArray)
+            for minor, delta in enumerate(deltas)
+        }
+        defaultDeltas[itemVarStore.NO_VARIATION_INDEX] = 0
+    else:
+        defaultDeltas = {0xFFFF: {0xFFFF: 0}}  # NO_VARIATION_INDEX
+        for major, deltas in enumerate(defaultDeltaArray):
+            defaultDeltasForMajor = defaultDeltas.setdefault(major, {})
+            for minor, delta in enumerate(deltas):
+                defaultDeltasForMajor[minor] = delta
     return defaultDeltas
 
 

{fonttools-4.58.4 → fonttools-4.58.5/Lib/fonttools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fonttools
-Version: 4.58.4
+Version: 4.58.5
 Summary: Tools to manipulate font files
 Home-page: http://github.com/fonttools/fonttools
 Author: Just van Rossum
@@ -388,6 +388,13 @@ Have fun!
 Changelog
 ~~~~~~~~~
 
+4.58.5 (released 2025-07-03)
+----------------------------
+
+- [feaLib] Don't try to combine ligature & multisub rules (#3874).
+- [feaLib/ast] Use weakref proxies to avoid cycles in visitor (#3873).
+- [varLib.instancer] Fixed instancing CFF2 fonts where VarData contains more than 64k items (#3858).
+
 4.58.4 (released 2025-06-13)
 ----------------------------
 

{fonttools-4.58.4 → fonttools-4.58.5}/Lib/fonttools.egg-info/SOURCES.txt

@@ -896,6 +896,8 @@ Tests/feaLib/data/cid_range.fea
 Tests/feaLib/data/cid_range.ttx
 Tests/feaLib/data/class_pair_pos_duplicates.fea
 Tests/feaLib/data/class_pair_pos_duplicates.ttx
+Tests/feaLib/data/combo_mult_and_lig_sub.fea
+Tests/feaLib/data/combo_mult_and_lig_sub.ttx
 Tests/feaLib/data/contextual_inline_format_4.fea
 Tests/feaLib/data/contextual_inline_format_4.ttx
 Tests/feaLib/data/contextual_inline_multi_sub_format_2.fea

{fonttools-4.58.4 → fonttools-4.58.5}/NEWS.rst

@@ -1,3 +1,10 @@
+4.58.5 (released 2025-07-03)
+----------------------------
+
+- [feaLib] Don't try to combine ligature & multisub rules (#3874).
+- [feaLib/ast] Use weakref proxies to avoid cycles in visitor (#3873).
+- [varLib.instancer] Fixed instancing CFF2 fonts where VarData contains more than 64k items (#3858).
+
 4.58.4 (released 2025-06-13)
 ----------------------------
 

{fonttools-4.58.4/Lib/fonttools.egg-info → fonttools-4.58.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fonttools
-Version: 4.58.4
+Version: 4.58.5
 Summary: Tools to manipulate font files
 Home-page: http://github.com/fonttools/fonttools
 Author: Just van Rossum
@@ -388,6 +388,13 @@ Have fun!
 Changelog
 ~~~~~~~~~
 
+4.58.5 (released 2025-07-03)
+----------------------------
+
+- [feaLib] Don't try to combine ligature & multisub rules (#3874).
+- [feaLib/ast] Use weakref proxies to avoid cycles in visitor (#3873).
+- [varLib.instancer] Fixed instancing CFF2 fonts where VarData contains more than 64k items (#3858).
+
 4.58.4 (released 2025-06-13)
 ----------------------------
 

{fonttools-4.58.4 → fonttools-4.58.5}/Tests/feaLib/builder_test.py

@@ -96,6 +96,7 @@ class BuilderTest(unittest.TestCase):
         useExtension
         bug3846_1 bug3846_2
         empty_filter_sets_and_mark_classes
+        combo_mult_and_lig_sub
     """.split()
 
     VARFONT_AXES = [
@@ -439,19 +440,25 @@ class BuilderTest(unittest.TestCase):
 
         assert "GSUB" in font
         lookups = font["GSUB"].table.LookupList.Lookup
-        self.assertEqual(len(lookups), 3)
+        self.assertEqual(len(lookups), 2)
         st = lookups[0].SubTable[0]
-        self.assertEqual(st.LookupType, 1)
-        self.assertEqual(st.mapping, {"A": "A.sc"})
-        st = lookups[1].SubTable[0]
+        # first should get promoted to multi
         self.assertEqual(st.LookupType, 2)
-        self.assertEqual(st.mapping, {"f_f": ("f", "f")})
-        st = lookups[2].SubTable[0]
+        self.assertEqual(st.mapping, {"A": ("A.sc",), "f_f": ("f", "f")})
+        # st = lookups[1].SubTable[0]
+        # self.assertEqual(st.LookupType, 2)
+        # self.assertEqual(st.mapping, {"f_f": ("f", "f")})
+        st = lookups[1].SubTable[0]
         self.assertEqual(st.LookupType, 4)
         self.assertEqual(len(st.ligatures), 1)
         self.assertEqual(len(st.ligatures["f"]), 1)
         self.assertEqual(st.ligatures["f"][0].LigGlyph, "f_f_i")
 
+        features = font["GSUB"].table.FeatureList.FeatureRecord
+        self.assertEqual(len(features), 1)
+        feat = features[0].Feature
+        self.assertEqual(feat.LookupListIndex, [0, 1])
+
     def test_pairPos_redefinition_warning(self):
         # https://github.com/fonttools/fonttools/issues/1147
         logger = logging.getLogger("fontTools.otlLib.builder")

fonttools-4.58.5/Tests/feaLib/data/combo_mult_and_lig_sub.fea

@@ -0,0 +1,5 @@
+feature blwf {
+    sub a b by c;
+    sub c by b a;
+} blwf;
+

fonttools-4.58.5/Tests/feaLib/data/combo_mult_and_lig_sub.ttx

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="4.58">
+
+  <GSUB>
+    <Version value="0x00010000"/>
+    <ScriptList>
+      <!-- ScriptCount=1 -->
+      <ScriptRecord index="0">
+        <ScriptTag value="DFLT"/>
+        <Script>
+          <DefaultLangSys>
+            <ReqFeatureIndex value="65535"/>
+            <!-- FeatureCount=1 -->
+            <FeatureIndex index="0" value="0"/>
+          </DefaultLangSys>
+          <!-- LangSysCount=0 -->
+        </Script>
+      </ScriptRecord>
+    </ScriptList>
+    <FeatureList>
+      <!-- FeatureCount=1 -->
+      <FeatureRecord index="0">
+        <FeatureTag value="blwf"/>
+        <Feature>
+          <!-- LookupCount=2 -->
+          <LookupListIndex index="0" value="0"/>
+          <LookupListIndex index="1" value="1"/>
+        </Feature>
+      </FeatureRecord>
+    </FeatureList>
+    <LookupList>
+      <!-- LookupCount=2 -->
+      <Lookup index="0">
+        <LookupType value="4"/>
+        <LookupFlag value="0"/>
+        <!-- SubTableCount=1 -->
+        <LigatureSubst index="0">
+          <LigatureSet glyph="a">
+            <Ligature components="b" glyph="c"/>
+          </LigatureSet>
+        </LigatureSubst>
+      </Lookup>
+      <Lookup index="1">
+        <LookupType value="2"/>
+        <LookupFlag value="0"/>
+        <!-- SubTableCount=1 -->
+        <MultipleSubst index="0">
+          <Substitution in="c" out="b,a"/>
+        </MultipleSubst>
+      </Lookup>
+    </LookupList>
+  </GSUB>
+
+</ttFont>

{fonttools-4.58.4 → fonttools-4.58.5}/Tests/ttx/ttx_test.py

@@ -471,7 +471,7 @@ def test_options_recalc_timestamp():
     assert tto.recalcTimestamp is True
 
 
-def test_options_recalc_timestamp():
+def test_options_no_recalc_timestamp():
     tto = ttx.Options([("--no-recalc-timestamp", "")], 1)
     assert tto.recalcTimestamp is False
 

{fonttools-4.58.4 → fonttools-4.58.5}/setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4.58.4
+current_version = 4.58.5
 commit = True
 tag = False
 tag_name = {new_version}

{fonttools-4.58.4 → fonttools-4.58.5}/setup.py

@@ -493,7 +493,7 @@ if ext_modules:
 
 setup_params = dict(
     name="fonttools",
-    version="4.58.4",
+    version="4.58.5",
     description="Tools to manipulate font files",
     author="Just van Rossum",
     author_email="just@letterror.com",