From deaf30d17c73839804014bc645fb929fa6b4c165 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 16 Dec 2021 13:32:11 -0700 Subject: [PATCH] [merge] Use merger-private namespace in TTFont.__dict__ --- Lib/fontTools/merge/__init__.py | 4 ++-- Lib/fontTools/merge/layout.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/fontTools/merge/__init__.py b/Lib/fontTools/merge/__init__.py index 1eb12ceed..8c00ed14f 100644 --- a/Lib/fontTools/merge/__init__.py +++ b/Lib/fontTools/merge/__init__.py @@ -56,8 +56,8 @@ class Merger(object): def _openFonts(self, fontfiles): fonts = [ttLib.TTFont(fontfile) for fontfile in fontfiles] for font,fontfile in zip(fonts, fontfiles): - font.fontfile = fontfile - font.name = font['name'].getDebugName(4) + font._merger__fontfile = fontfile + font._merger__name = font['name'].getDebugName(4) return fonts def merge(self, fontfiles): diff --git a/Lib/fontTools/merge/layout.py b/Lib/fontTools/merge/layout.py index 2890f0d66..bfc2b4341 100644 --- a/Lib/fontTools/merge/layout.py +++ b/Lib/fontTools/merge/layout.py @@ -182,7 +182,7 @@ def merge(self, m, tables): for i,(table,dups) in enumerate(zip(tables, m.duplicateGlyphsPerFont)): if not dups: continue if table is None or table is NotImplemented: - log.warning("Have non-identical duplicates to resolve for '%s' but no GSUB. Are duplicates intended?: %s", m.fonts[i].name, dups) + log.warning("Have non-identical duplicates to resolve for '%s' but no GSUB. Are duplicates intended?: %s", m.fonts[i]._merger__name, dups) continue synthFeature = None