shadowfacts/fonttools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Many fixes...

Browse Source
This commit is contained in:
Simon Cozens 2021-03-15 12:50:47 +00:00
parent 5bac84374b
commit 46bd7a7e97
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Lib/fontTools/varLib/errors.py
View File

@ -32,7 +32,8 @@ class VarLibMergeError(VarLibError):
self.merger = merger self.merger = merger
self.args = args self.args = args
def _master_name(self, ttf, ix): def _master_name(self, ix):
ttf = self.merger.ttfs[ix]
if "name" in ttf: if "name" in ttf:
return ttf["name"].getDebugName(1) + " " + ttf["name"].getDebugName(2) return ttf["name"].getDebugName(1) + " " + ttf["name"].getDebugName(2)
elif hasattr(ttf.reader, "file") and hasattr(ttf.reader.file, "name"): elif hasattr(ttf.reader, "file") and hasattr(ttf.reader.file, "name"):
@ -40,31 +41,36 @@ class VarLibMergeError(VarLibError):
else: else:
return "master number %i" % ix return "master number %i" % ix
def _offender(self, cause):
reason = cause["reason"].value
if "expected" in cause and "got" in cause:
index = [x == cause["expected"] for x in cause["got"]].index(False)
return index, self._master_name(index)
if reason == VarLibMergeFailure.FoundANone:
index = [x is None for x in cause["got"]].index(True)
return index, self._master_name(index)
return None, None
def __str__(self): def __str__(self):
cause, stack = self.args[0], self.args[1:] cause, stack = self.args[0], self.args[1:]
fontnames = [
self._master_name(ttf, ix) for ix, ttf in enumerate(self.merger.ttfs)
]
context = "".join(reversed(stack)) context = "".join(reversed(stack))
details = "" details = ""
reason = cause["reason"].value reason = cause["reason"].value
if reason == VarLibMergeFailure.FoundANone: offender_index, offender = self._offender(cause)
offender = [x is None for x in cause["got"]].index(True) if offender:
details = ( details = f"\n\nThe problem is likely to be in {offender}:\n"
f"\n\nThe problem is likely to be in {fontnames[offender]}:\n" if cause["reason"] == VarLibMergeFailure.FoundANone:
f"{stack[0]}=={cause['got']}\n" details = details + f"{stack[0]}=={cause['got']}\n"
)
elif "expected" in cause and "got" in cause: elif "expected" in cause and "got" in cause:
offender = [x == cause["expected"] for x in cause["got"]].index(False) offender = [x == cause["expected"] for x in cause["got"]].index(False)
got = cause["got"][offender] got = cause["got"][offender]
details = ( details = details + (
f"\n\nThe problem is likely to be in {fontnames[offender]}:\n"
f"Expected to see {stack[0]}=={cause['expected']}, instead saw {got}\n" f"Expected to see {stack[0]}=={cause['expected']}, instead saw {got}\n"
) )
if ( if (
reason == VarLibMergeFailure.UnsupportedFormat cause["reason"] == VarLibMergeFailure.UnsupportedFormat
or reason == VarLibMergeFailure.InconsistentFormat or cause["reason"] == VarLibMergeFailure.InconsistentFormat
): ):
reason = reason % cause["subtable"] reason = reason % cause["subtable"]
basic = textwrap.fill( basic = textwrap.fill(