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

fix unknown subtable format and handling of Apple fonts

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fonttools/code/trunk@207 4cde692c-a291-49d1-8350-778aa11640f8
This commit is contained in:
jvr 2002-05-10 19:52:14 +00:00
parent 22dcb9e6f9
commit 6fc514edf3
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Lib/fontTools/ttLib/tables/_k_e_r_n.py
View File

@ -26,10 +26,15 @@ class table__k_e_r_n(DefaultTable.DefaultTable):
tablesIndex = [] tablesIndex = []
self.kernTables = [] self.kernTables = []
for i in range(nTables): for i in range(nTables):
version, length = struct.unpack(">HH", data[:4]) if self.version == 1.0:
# Apple
length, coverage, tupleIndex = struct.unpack(">lHH", data[:8])
version = coverage & 0xff
else:
version, length = struct.unpack(">HH", data[:4])
length = int(length) length = int(length)
if not kern_classes.has_key(version): if not kern_classes.has_key(version):
subtable = KernTable_format_unkown() subtable = KernTable_format_unkown(version)
else: else:
subtable = kern_classes[version]() subtable = kern_classes[version]()
subtable.decompile(data[:length], ttFont) subtable.decompile(data[:length], ttFont)
@ -40,7 +45,7 @@ class table__k_e_r_n(DefaultTable.DefaultTable):
nTables = len(self.kernTables) nTables = len(self.kernTables)
if self.version == 1.0: if self.version == 1.0:
# Apple's new format. # Apple's new format.
data = struct.pack(">ll", self.version * 0x1000, nTables) data = struct.pack(">ll", self.version * 0x10000, nTables)
else: else:
data = struct.pack(">HH", self.version, nTables) data = struct.pack(">HH", self.version, nTables)
for subtable in self.kernTables: for subtable in self.kernTables:
@ -63,7 +68,7 @@ class table__k_e_r_n(DefaultTable.DefaultTable):
self.kernTables = [] self.kernTables = []
format = safeEval(attrs["format"]) format = safeEval(attrs["format"])
if not kern_classes.has_key(format): if not kern_classes.has_key(format):
subtable = KernTable_format_unkown() subtable = KernTable_format_unkown(format)
else: else:
subtable = kern_classes[format]() subtable = kern_classes[format]()
self.kernTables.append(subtable) self.kernTables.append(subtable)
@ -87,7 +92,7 @@ class KernTable_format_0:
data = data[6:] data = data[6:]
left, right = int(left), int(right) left, right = int(left), int(right)
kernTable[(ttFont.getGlyphName(left), ttFont.getGlyphName(right))] = value kernTable[(ttFont.getGlyphName(left), ttFont.getGlyphName(right))] = value
assert len(data) == 0 assert len(data) == 0, len(data)
def compile(self, ttFont): def compile(self, ttFont):
nPairs = len(self.kernTable) nPairs = len(self.kernTable)
@ -150,7 +155,7 @@ class KernTable_format_2:
self.data = data self.data = data
def compile(self, ttFont): def compile(self, ttFont):
return data return self.data
def toXML(self, writer): def toXML(self, writer):
writer.begintag("kernsubtable", format=2) writer.begintag("kernsubtable", format=2)
@ -160,27 +165,31 @@ class KernTable_format_2:
writer.newline() writer.newline()
def fromXML(self, (name, attrs, content), ttFont): def fromXML(self, (name, attrs, content), ttFont):
self.decompile(readHex(content)) self.decompile(readHex(content), ttFont)
class KernTable_format_unkown: class KernTable_format_unkown:
def __init__(self, format):
self.format = format
def decompile(self, data, ttFont): def decompile(self, data, ttFont):
self.data = data self.data = data
def compile(self, ttFont): def compile(self, ttFont):
return data return self.data
def toXML(self, writer, ttFont): def toXML(self, writer, ttFont):
writer.begintag("kernsubtable", format="-1") writer.begintag("kernsubtable", format=self.format)
writer.newline() writer.newline()
writer.comment("unknown 'kern' subtable format") writer.comment("unknown 'kern' subtable format")
writer.newline()
writer.dumphex(self.data) writer.dumphex(self.data)
writer.endtag("kernsubtable") writer.endtag("kernsubtable")
writer.newline() writer.newline()
def fromXML(self, (name, attrs, content), ttFont): def fromXML(self, (name, attrs, content), ttFont):
self.decompile(readHex(content)) self.decompile(readHex(content), ttFont)