fonttools 4.58.1__cp39-cp39-win_amd64.whl → 4.58.3__cp39-cp39-win_amd64.whl

fontTools/__init__.py

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

fontTools/feaLib/ast.py

@@ -719,7 +719,7 @@ class ChainContextPosStatement(Statement):
         for i, lookup in enumerate(lookups):
             if lookup:
                 try:
-                    (_ for _ in lookup)
+                    iter(lookup)
                 except TypeError:
                     self.lookups[i] = [lookup]
 
@@ -777,7 +777,7 @@ class ChainContextSubstStatement(Statement):
         for i, lookup in enumerate(lookups):
             if lookup:
                 try:
-                    (_ for _ in lookup)
+                    iter(lookup)
                 except TypeError:
                     self.lookups[i] = [lookup]
 

fontTools/subset/__init__.py

@@ -2,6 +2,8 @@
 #
 # Google Author(s): Behdad Esfahbod
 
+from __future__ import annotations
+
 from fontTools import config
 from fontTools.misc.roundTools import otRound
 from fontTools import ttLib
@@ -15,7 +17,7 @@ from fontTools.subset.util import _add_method, _uniq_sort
 from fontTools.subset.cff import *
 from fontTools.subset.svg import *
 from fontTools.varLib import varStore, multiVarStore  # For monkey-patching
-from fontTools.ttLib.tables._n_a_m_e import NameRecordVisitor
+from fontTools.ttLib.tables._n_a_m_e import NameRecordVisitor, makeName
 from fontTools.unicodedata import mirrored
 import sys
 import struct
@@ -3004,6 +3006,9 @@ def prune_pre_subset(self, font, options):
     return True
 
 
+NAME_IDS_TO_OBFUSCATE = {1, 2, 3, 4, 6, 16, 17, 18}
+
+
 @_add_method(ttLib.getTableClass("name"))
 def prune_post_subset(self, font, options):
     visitor = NameRecordVisitor()
@@ -3022,6 +3027,11 @@ def prune_post_subset(self, font, options):
         self.names = [n for n in self.names if n.langID in options.name_languages]
     if options.obfuscate_names:
         namerecs = []
+        # Preserve names to be scrambled or dropped elsewhere so that other
+        # parts of the font don't break.
+        needRemapping = visitor.seen.intersection(NAME_IDS_TO_OBFUSCATE)
+        if needRemapping:
+            _remap_select_name_ids(font, needRemapping)
         for n in self.names:
             if n.nameID in [1, 4]:
                 n.string = ".\x7f".encode("utf_16_be") if n.isUnicode() else ".\x7f"
@@ -3036,6 +3046,76 @@ def prune_post_subset(self, font, options):
     return True  # Required table
 
 
+def _remap_select_name_ids(font: ttLib.TTFont, needRemapping: set[int]) -> None:
+    """Remap a set of IDs so that the originals can be safely scrambled or
+    dropped.
+
+    For each name record whose name id is in the `needRemapping` set, make a copy
+    and allocate a new unused name id in the font-specific range (> 255).
+
+    Finally update references to these in the `fvar` and `STAT` tables.
+    """
+
+    if "fvar" not in font and "STAT" not in font:
+        return
+
+    name = font["name"]
+
+    # 1. Assign new IDs for names to be preserved.
+    existingIds = {record.nameID for record in name.names}
+    remapping = {}
+    nextId = name._findUnusedNameID() - 1  # Should skip gaps in name IDs.
+    for nameId in needRemapping:
+        nextId += 1  # We should have complete freedom until 32767.
+        assert nextId not in existingIds, "_findUnusedNameID did not skip gaps"
+        if nextId > 32767:
+            raise ValueError("Ran out of name IDs while trying to remap existing ones.")
+        remapping[nameId] = nextId
+
+    # 2. Copy records to use the new ID. We can't rewrite them in place, because
+    #    that could make IDs 1 to 6 "disappear" from code that follows. Some
+    #    tools that produce EOT fonts expect them to exist, even when they're
+    #    scrambled. See https://github.com/fonttools/fonttools/issues/165.
+    copiedRecords = []
+    for record in name.names:
+        if record.nameID not in needRemapping:
+            continue
+        recordCopy = makeName(
+            record.string,
+            remapping[record.nameID],
+            record.platformID,
+            record.platEncID,
+            record.langID,
+        )
+        copiedRecords.append(recordCopy)
+    name.names.extend(copiedRecords)
+
+    # 3. Rewrite the corresponding IDs in other tables. For now, care only about
+    #    STAT and fvar. If more tables need to be changed, consider adapting
+    #    NameRecordVisitor to rewrite IDs wherever it finds them.
+    fvar = font.get("fvar")
+    if fvar is not None:
+        for axis in fvar.axes:
+            axis.axisNameID = remapping.get(axis.axisNameID, axis.axisNameID)
+        for instance in fvar.instances:
+            nameID = instance.subfamilyNameID
+            instance.subfamilyNameID = remapping.get(nameID, nameID)
+            nameID = instance.postscriptNameID
+            instance.postscriptNameID = remapping.get(nameID, nameID)
+
+    stat = font.get("STAT")
+    if stat is None:
+        return
+    elidedNameID = stat.table.ElidedFallbackNameID
+    stat.table.ElidedFallbackNameID = remapping.get(elidedNameID, elidedNameID)
+    if stat.table.DesignAxisRecord:
+        for axis in stat.table.DesignAxisRecord.Axis:
+            axis.AxisNameID = remapping.get(axis.AxisNameID, axis.AxisNameID)
+    if stat.table.AxisValueArray:
+        for value in stat.table.AxisValueArray.AxisValue:
+            value.ValueNameID = remapping.get(value.ValueNameID, value.ValueNameID)
+
+
 @_add_method(ttLib.getTableClass("head"))
 def prune_post_subset(self, font, options):
     # Force re-compiling head table, to update any recalculated values.

fontTools/ttLib/reorderGlyphs.py

@@ -275,10 +275,11 @@ def reorderGlyphs(font: ttLib.TTFont, new_glyph_order: List[str]):
                 for reorder in _REORDER_RULES.get(reorder_key, []):
                     reorder.apply(font, value)
 
-    if "CFF " in font:
-        cff_table = font["CFF "]
-        charstrings = cff_table.cff.topDictIndex[0].CharStrings.charStrings
-        cff_table.cff.topDictIndex[0].charset = new_glyph_order
-        cff_table.cff.topDictIndex[0].CharStrings.charStrings = {
-            k: charstrings.get(k) for k in new_glyph_order
-        }
+    for tag in ["CFF ", "CFF2"]:
+        if tag in font:
+            cff_table = font[tag]
+            charstrings = cff_table.cff.topDictIndex[0].CharStrings.charStrings
+            cff_table.cff.topDictIndex[0].charset = new_glyph_order
+            cff_table.cff.topDictIndex[0].CharStrings.charStrings = {
+                k: charstrings.get(k) for k in new_glyph_order
+            }

{fonttools-4.58.1.dist-info → fonttools-4.58.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fonttools
-Version: 4.58.1
+Version: 4.58.3
 Summary: Tools to manipulate font files
 Home-page: http://github.com/fonttools/fonttools
 Author: Just van Rossum
@@ -388,6 +388,17 @@ Have fun!
 Changelog
 ~~~~~~~~~
 
+4.58.3 (released 2025-06-13)
+----------------------------
+
+- [feaLib] Fixed iterable check for Python 3.13.4 and newer (#3854, #3855).
+
+4.58.2 (released 2025-06-06)
+----------------------------
+
+- [ttLib.reorderGlyphs] Handle CFF2 when reordering glyphs (#3852)
+- [subset] Copy name IDs in use before scrapping or scrambling them for webfonts (#3853)
+
 4.58.1 (released 2025-05-28)
 ----------------------------
 

{fonttools-4.58.1.dist-info → fonttools-4.58.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fontTools/__init__.py,sha256=mQnQHjRRWsckdLReNNTqKwc6yvMSmkoq-jW3jC_Qieo,191
+fontTools/__init__.py,sha256=15whx9IXkutLVZCICM6AMqLSXzr2yczrtjGq8Wwd4Ds,191
 fontTools/__main__.py,sha256=T8Tg8xPKHOCVoYVG82p_zpQXfW7_ERRAphBkZVvhWN8,960
 fontTools/afmLib.py,sha256=YbmmjT8Du6qFUhFHwnAhOdvsyfXszODVjSJtd18CCjY,13603
 fontTools/agl.py,sha256=4aKwnbvSVUa39eV5Ka8e5ULwV-IEp4pcfwlMwEH_z3k,118208
@@ -24,7 +24,7 @@ fontTools/cu2qu/__init__.py,sha256=OoM_nBJAleZal6kxeNJn1ESy1pNm5c3DG417yVIE0-Q,6
 fontTools/cu2qu/__main__.py,sha256=6Vb8Ler3yqJ5w84UwlMJV6cS01uhV4PN10OlXQ6jlqo,98
 fontTools/cu2qu/benchmark.py,sha256=FwdvNjKfWHo18_CX0CO8AY5c68XSBE4M4TJo_EkB4q8,1350
 fontTools/cu2qu/cli.py,sha256=CvWzC5a6XF_v5o0yrS4vGI1JXiVVLzSJahTIqpJmiPk,6274
-fontTools/cu2qu/cu2qu.cp39-win_amd64.pyd,sha256=QTTeAxXGHfWCi5VxYUEPCitLkoVq4wOVLVO1t-pAXfY,99328
+fontTools/cu2qu/cu2qu.cp39-win_amd64.pyd,sha256=LqBteRUBaMUmGoVhQUfIVhxI8-Sc5hFdeyRO8WGOExk,99840
 fontTools/cu2qu/cu2qu.py,sha256=XH2bnQ5aG9ic921ZWzQzU1-q3MQU6INCjLk4XjRj5_Y,16970
 fontTools/cu2qu/errors.py,sha256=uYyPSs_x-EMJKO2S3cLGWyk_KlHoOoh_XEtdB_oKBp0,2518
 fontTools/cu2qu/ufo.py,sha256=Mpd_7Be9jxNcOKFqkyRp8Oem3CS3R-ZYMMSD03LJL6o,12143
@@ -39,10 +39,10 @@ fontTools/encodings/__init__.py,sha256=QoK6HlOoqtVqX5gOyv0bJiTXsVBbBRreUifdccWNp
 fontTools/encodings/codecs.py,sha256=bSpO6kuPbEIDsXSVHhzftqsm_FFUiXpLVfPSk410SqE,4856
 fontTools/feaLib/__init__.py,sha256=RprjP6BKswq4pt0J-9L1XGuZfjIFAGD6HDly_haMAN4,217
 fontTools/feaLib/__main__.py,sha256=niUAPkiYxeRAJMlJuvVJZism2VFufZrNaQtieA7sNLk,2318
-fontTools/feaLib/ast.py,sha256=5VNYmlsp_cUG0dvWnm4WtQSAqE1OfOp8G9y2GIUkoXI,76284
+fontTools/feaLib/ast.py,sha256=jyQ-s8Ge0lofy9iFRC45T_heW5TET--qoPtNst1Au9Q,76270
 fontTools/feaLib/builder.py,sha256=6ubKf1ZF6xj6o2_P19NS85y9JOlS82I4UksdswMO5fk,74848
 fontTools/feaLib/error.py,sha256=pqi8F2tnH2h7pXVffxwzuBuWaSHMzZsXs5VckdQKQAI,670
-fontTools/feaLib/lexer.cp39-win_amd64.pyd,sha256=m7cFVWkXR2B3tDHY1glXClV1Xnktuv6E7mpCA39Y5DY,121344
+fontTools/feaLib/lexer.cp39-win_amd64.pyd,sha256=-UF5xXmAJbFwP5kTRdc41tfKBaZ1iPHjqfzm7jTqgh0,121344
 fontTools/feaLib/lexer.py,sha256=7VZ3NPFH7V1mvRbym111BNKvbB4hLfGLTMS0VV_3Ipw,11408
 fontTools/feaLib/location.py,sha256=teHrhjT8zzImcGBEJS1J43oaX9onCPu_pynxS8d-tUg,246
 fontTools/feaLib/lookupDebugInfo.py,sha256=h4Ig8kmEk5WlGf1C9JJAbbOKQK5OwkFLdj8CT7fOkmU,316
@@ -59,7 +59,7 @@ fontTools/merge/unicode.py,sha256=mgqRFhRugda62Xt0r28SduaN7YBzRfHxrpNprjLqoX8,43
 fontTools/merge/util.py,sha256=3alo4b7mhFNC6h8PjeqNU99dS7EuO8sdZkZpvRsEE6E,3521
 fontTools/misc/__init__.py,sha256=QoK6HlOoqtVqX5gOyv0bJiTXsVBbBRreUifdccWNp2k,76
 fontTools/misc/arrayTools.py,sha256=baENNALPvYRUhS4rdx_F3ltOmVIf1PV9G2EaMt7gAHM,11907
-fontTools/misc/bezierTools.cp39-win_amd64.pyd,sha256=AlphJVUi5PaRAIue_VUyowQDprA4eyBNj_ZyRp9hqgU,345600
+fontTools/misc/bezierTools.cp39-win_amd64.pyd,sha256=O9h7dOF20a3Lci4Jq_MnB_98kjcXbHOjT78ZQ4ua3qQ,346112
 fontTools/misc/bezierTools.py,sha256=m4j14ckKYtrKy8NhFFFY_Uv3kuL8g-SWNdEKUzqGjRQ,46535
 fontTools/misc/classifyTools.py,sha256=wLTjOhLiZaLiwwUTj2Ad5eZ5T_38W0Eo_uzRGWHWYvE,5783
 fontTools/misc/cliTools.py,sha256=7zKOXczaCKRMW6Yv5jdCZYHco8y0-lfimhIWzQ2IL8A,1915
@@ -115,7 +115,7 @@ fontTools/pens/explicitClosingLinePen.py,sha256=knCXcjSl2iPy6mLCDnsdDYx6J5rV7FH4
 fontTools/pens/filterPen.py,sha256=tWhgklyaCTUt7oQRTBbFUcOlc702V0NfadCH3X93CYg,8031
 fontTools/pens/freetypePen.py,sha256=NqNzXrOTDckoH4N6WLnj-KuxGcg6z7DlqSCfmpq8qAE,20370
 fontTools/pens/hashPointPen.py,sha256=ZAU87uw5ge3Kb4i9kRV28a5VFeZ_TWSsJabyAzwAHrU,3662
-fontTools/pens/momentsPen.cp39-win_amd64.pyd,sha256=rFxl7zLW_PUbn_OMGqrMzyW7k_N4wHNU8Y_KPeaBLw0,89088
+fontTools/pens/momentsPen.cp39-win_amd64.pyd,sha256=6wAG0wSAd7anOa0PCZSY3LLDy3YpsMrCV9aiOVxoy1Y,89088
 fontTools/pens/momentsPen.py,sha256=Z-V5CjQBSj3qPxg3C_DBFKExqno89nOe3jWwHT9_xsM,26537
 fontTools/pens/perimeterPen.py,sha256=Zy5F8QzaNJAkkQQSb2QJCp-wZTvDAjBn-B099t2ABds,2222
 fontTools/pens/pointInsidePen.py,sha256=Hy48iR5NWV3x_wWoos-UC7GMtwvvUhd_q_ykiwaWdzQ,6547
@@ -138,9 +138,9 @@ fontTools/qu2cu/__init__.py,sha256=MpdE0XsHSDo9M3hyHLkPPLxB3FKr3aiT0dPW5qHCuSo,6
 fontTools/qu2cu/__main__.py,sha256=leKpToUNNyHf0nobr1I19vus2ziA1pO7rRKkreat-Xw,100
 fontTools/qu2cu/benchmark.py,sha256=PFxx2Bfu7-KuNrzdOIBXHPZvyNphqqcTVy4CneaCo3M,1456
 fontTools/qu2cu/cli.py,sha256=1QLBTSZW7e_VATJN9vjszRxIk_-Xjxu1KP53yX4T7q8,3839
-fontTools/qu2cu/qu2cu.cp39-win_amd64.pyd,sha256=xP1adGSiD9THdObqHlTcWwZaQuVn7ATF72Uvr07M7RQ,107008
+fontTools/qu2cu/qu2cu.cp39-win_amd64.pyd,sha256=2fEhG9RWAASW2P9hZo1hmHPyKLM0aRy8sF8QSUxeh0k,107008
 fontTools/qu2cu/qu2cu.py,sha256=dtp5Zqhcs_NePwA2U5fgG2LtWleRwmBilTurau8sLL0,12693
-fontTools/subset/__init__.py,sha256=lVd_1uDS_EarrbqfeuVsZl4UX8h9ZraWsuNpEoq999k,138195
+fontTools/subset/__init__.py,sha256=UUOidAx7b_LNNsRnEizxG8tPF5JX5-4fooerwyTWFvU,141588
 fontTools/subset/__main__.py,sha256=cEIC52EtGOJvFDfHXzi0M2EAYmyHAcI-ZZ0lb2y4r7s,101
 fontTools/subset/cff.py,sha256=GSmxdsokxuFKvJJQVcAIOhd5hYQq8KkzxnXE_dgm8yo,6329
 fontTools/subset/svg.py,sha256=y_yTZuAm3bjcoEOFu5likXoHuG5u1oNiv0mOni2Z9fQ,9637
@@ -155,7 +155,7 @@ fontTools/ttLib/__init__.py,sha256=2dJ9-KzN_5AwttwMEhmusrxR2IdFTZ73hJiPjeVwuwU,6
 fontTools/ttLib/__main__.py,sha256=gSaKy1O2Hws3_1xGHGdLL-lEUVxw9q8ymNx9YlwIFXs,4881
 fontTools/ttLib/macUtils.py,sha256=B5UhZU8gQerJMXEG9-BGZsuv3aewFRAGQ5HCuZMzMkQ,1791
 fontTools/ttLib/removeOverlaps.py,sha256=PTxICjLx89JxKfboLruoV_OwuwCIxcJ4feNcCCkrsTQ,13005
-fontTools/ttLib/reorderGlyphs.py,sha256=_sTg1wR9q8ZFeo4n7H7iUcqGIWOroqDQd_UbZ-1kZh0,10600
+fontTools/ttLib/reorderGlyphs.py,sha256=PAHvoh4yN3u-_aDACH8H1ResVMCmVE7Kp5_mIKAG0TI,10656
 fontTools/ttLib/scaleUpem.py,sha256=Qz-kS48q7a5GibgnPoUglyVk_qIVkYp5KZ-r1aMx_7Q,15054
 fontTools/ttLib/sfnt.py,sha256=7X9xujgV0Za4nOEfUD3mSrrRb-f9NuzEqgJ-IFLNVQU,23494
 fontTools/ttLib/standardGlyphOrder.py,sha256=VG-8hW1VgQIro7cDJusSXThILIr4pQgmU37t85SQ65Y,6056
@@ -296,7 +296,7 @@ fontTools/varLib/interpolatablePlot.py,sha256=tUKFd8H9B2eD_GE6jV13J-dZkkIeLmk3oj
 fontTools/varLib/interpolatableTestContourOrder.py,sha256=Pbt0jW0LoVggIwrtADZ7HWK6Ftdoo1bjuWz0ost0HD0,3103
 fontTools/varLib/interpolatableTestStartingPoint.py,sha256=f5MJ3mj8MctJCvDJwqmW1fIVOgovUMYAOela9HweaRU,4403
 fontTools/varLib/interpolate_layout.py,sha256=tTPUes_K7MwooUO_wac9AeFEVgL1uGSz4ITYiOizaME,3813
-fontTools/varLib/iup.cp39-win_amd64.pyd,sha256=J05L42vfpS-0cvxIAMqaLlAav8JQ1OSgF2T0-FLxDZ8,129024
+fontTools/varLib/iup.cp39-win_amd64.pyd,sha256=o1WTksP5VEbradyW58yyA7JU9pPKtsw87QU1yeGNucc,130048
 fontTools/varLib/iup.py,sha256=O_xPJOBECrNDbQqCC3e5xf9KsWXUd1i3BAp9Fl6Hv2Y,15474
 fontTools/varLib/merger.py,sha256=V-B17poOYbbrRsfUYJbdqt46GtRfG833MKwtv9NOB3Q,62519
 fontTools/varLib/models.py,sha256=ZqQb1Lapj5dCO8dwa3UTx1LsIpF0-GiDte32t_TMJJQ,23040
@@ -318,11 +318,11 @@ fontTools/voltLib/error.py,sha256=3TsaZBA82acFd2j5Beq3WUQTURTKM0zxOnUFGZovSNA,40
 fontTools/voltLib/lexer.py,sha256=v9V4zdBO2VqVJG__IWrL8fv_CRURmh2eD_1UpbIJn9g,3467
 fontTools/voltLib/parser.py,sha256=HS72gxtFzvcPSwEbUYj3E41CPK7ZqK9mSe0nLRxn-IY,26060
 fontTools/voltLib/voltToFea.py,sha256=nS-OSlx_a-TngGICFNKyFxMhjqkV3OQLcvyzw4sQFyk,37460
-fonttools-4.58.1.data/data/share/man/man1/ttx.1,sha256=E71F9mRNWlttVpzlnP7w_fqkQygPkph5s-AtVa0Js50,5601
-fonttools-4.58.1.dist-info/licenses/LICENSE,sha256=Ir74Bpfs-qF_l-YrmibfoSggvgVYPo3RKtFpskEnTJk,1093
-fonttools-4.58.1.dist-info/licenses/LICENSE.external,sha256=p5eWRJLxSGv9_M1uYYVeOjFkXzYCPqXeeF2jfqwvy04,19046
-fonttools-4.58.1.dist-info/METADATA,sha256=iSYxkeSuqBTAaO0O283sMXDFmK-pV3YyArmloA_vl20,108247
-fonttools-4.58.1.dist-info/WHEEL,sha256=XkFE14KmFh7mutkkb-qn_ueuH2lwfT8rLdfc5xpQ7wE,99
-fonttools-4.58.1.dist-info/entry_points.txt,sha256=8kVHddxfFWA44FSD4mBpmC-4uCynQnkoz_9aNJb227Y,147
-fonttools-4.58.1.dist-info/top_level.txt,sha256=rRgRylrXzekqWOsrhygzib12pQ7WILf7UGjqEwkIFDM,10
-fonttools-4.58.1.dist-info/RECORD,,
+fonttools-4.58.3.data/data/share/man/man1/ttx.1,sha256=E71F9mRNWlttVpzlnP7w_fqkQygPkph5s-AtVa0Js50,5601
+fonttools-4.58.3.dist-info/licenses/LICENSE,sha256=Ir74Bpfs-qF_l-YrmibfoSggvgVYPo3RKtFpskEnTJk,1093
+fonttools-4.58.3.dist-info/licenses/LICENSE.external,sha256=p5eWRJLxSGv9_M1uYYVeOjFkXzYCPqXeeF2jfqwvy04,19046
+fonttools-4.58.3.dist-info/METADATA,sha256=JFC47xWFnAi-sGMqRczzxjqKxlb6zr0nniG2LBpx4iE,108610
+fonttools-4.58.3.dist-info/WHEEL,sha256=XkFE14KmFh7mutkkb-qn_ueuH2lwfT8rLdfc5xpQ7wE,99
+fonttools-4.58.3.dist-info/entry_points.txt,sha256=8kVHddxfFWA44FSD4mBpmC-4uCynQnkoz_9aNJb227Y,147
+fonttools-4.58.3.dist-info/top_level.txt,sha256=rRgRylrXzekqWOsrhygzib12pQ7WILf7UGjqEwkIFDM,10
+fonttools-4.58.3.dist-info/RECORD,,