diff --git a/Lib/fontTools/merge/__init__.py b/Lib/fontTools/merge/__init__.py index babc33192..3824b3f6e 100644 --- a/Lib/fontTools/merge/__init__.py +++ b/Lib/fontTools/merge/__init__.py @@ -57,7 +57,7 @@ class Merger(object): fonts = [ttLib.TTFont(fontfile) for fontfile in fontfiles] for font,fontfile in zip(fonts, fontfiles): font.fontfile = fontfile - font.name = font['name'].getDebugName(3) + font.name = font['name'].getDebugName(4) return fonts def merge(self, fontfiles): diff --git a/Lib/fontTools/merge/cmap.py b/Lib/fontTools/merge/cmap.py index 458b34b03..4ae72b6f5 100644 --- a/Lib/fontTools/merge/cmap.py +++ b/Lib/fontTools/merge/cmap.py @@ -73,7 +73,7 @@ def computeMegaCmap(merger, tables): format12 = subtable else: log.warning( - "Dropped cmap subtable from font [%s]:\t" + "Dropped cmap subtable from font '%s':\t" "format %2s, platformID %2s, platEncID %2s", fontIdx, subtable.format, subtable.platformID, subtable.platEncID ) diff --git a/Lib/fontTools/merge/layout.py b/Lib/fontTools/merge/layout.py index c6919b018..cbed54422 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 font %d but no GSUB. Are duplicates intended?: %s" % (i + 1, dups)) + log.warning("Have non-identical duplicates to resolve for '%s' but no GSUB. Are duplicates intended?: %s" % (m.fonts[i].name, dups)) continue synthFeature = None