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

Rename BitmapSet to Strike

Browse Source
This commit is contained in:
Jens Kutilek 2014-09-22 17:07:01 +02:00
parent 20125e16f4
commit 590906c7b4
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Lib/fontTools/ttLib/tables/_s_b_i_x.py
View File

@ -86,16 +86,16 @@ class table__s_b_i_x(DefaultTable.DefaultTable):
offsetEntry) offsetEntry)
self.bitmapSetOffsets.append(offsetEntry.offset) self.bitmapSetOffsets.append(offsetEntry.offset)
# decompile BitmapSets # decompile Strikes
for i in range(self.numStrikes-1, -1, -1): for i in range(self.numStrikes-1, -1, -1):
myBitmapSet = BitmapSet(rawdata=data[self.bitmapSetOffsets[i]:]) myBitmapSet = Strike(rawdata=data[self.bitmapSetOffsets[i]:])
data = data[:self.bitmapSetOffsets[i]] data = data[:self.bitmapSetOffsets[i]]
myBitmapSet.decompile(ttFont) myBitmapSet.decompile(ttFont)
#print " BitmapSet length: %xh" % len(bitmapSetData) #print " Strike length: %xh" % len(bitmapSetData)
#print "Number of Bitmaps:", myBitmapSet.numBitmaps #print "Number of Bitmaps:", myBitmapSet.numBitmaps
if myBitmapSet.size in self.bitmapSets: if myBitmapSet.size in self.bitmapSets:
from fontTools import ttLib from fontTools import ttLib
raise ttLib.TTLibError("Pixel 'size' must be unique for each BitmapSet") raise ttLib.TTLibError("Pixel 'size' must be unique for each Strike")
self.bitmapSets[myBitmapSet.size] = myBitmapSet self.bitmapSets[myBitmapSet.size] = myBitmapSet
# after the bitmaps have been extracted, we don't need the offsets anymore # after the bitmaps have been extracted, we don't need the offsets anymore
@ -131,8 +131,8 @@ class table__s_b_i_x(DefaultTable.DefaultTable):
def fromXML(self, name, attrs, content, ttFont): def fromXML(self, name, attrs, content, ttFont):
if name in ["version", "flags"]: if name in ["version", "flags"]:
setattr(self, name, int(attrs["value"])) setattr(self, name, int(attrs["value"]))
elif name == "bitmapSet": elif name == "strike":
myBitmapSet = BitmapSet() myBitmapSet = Strike()
for element in content: for element in content:
if isinstance(element, tuple): if isinstance(element, tuple):
name, attrs, content = element name, attrs, content = element

10
Lib/fontTools/ttLib/tables/sbixStrike.py
View File

@ -20,7 +20,7 @@ sbixBitmapSetHeaderFormatSize = sstruct.calcsize(sbixBitmapSetHeaderFormat)
sbixBitmapOffsetEntryFormatSize = sstruct.calcsize(sbixBitmapOffsetEntryFormat) sbixBitmapOffsetEntryFormatSize = sstruct.calcsize(sbixBitmapOffsetEntryFormat)
class BitmapSet(object): class Strike(object):
def __init__(self, rawdata=None, size=0, resolution=72): def __init__(self, rawdata=None, size=0, resolution=72):
self.data = rawdata self.data = rawdata
self.size = size self.size = size
@ -33,10 +33,10 @@ class BitmapSet(object):
raise ttLib.TTLibError raise ttLib.TTLibError
if len(self.data) < sbixBitmapSetHeaderFormatSize: if len(self.data) < sbixBitmapSetHeaderFormatSize:
from fontTools import ttLib from fontTools import ttLib
raise(ttLib.TTLibError, "BitmapSet header too short: Expected %x, got %x.") \ raise(ttLib.TTLibError, "Strike header too short: Expected %x, got %x.") \
% (sbixBitmapSetHeaderFormatSize, len(self.data)) % (sbixBitmapSetHeaderFormatSize, len(self.data))
# read BitmapSet header from raw data # read Strike header from raw data
sstruct.unpack(sbixBitmapSetHeaderFormat, self.data[:sbixBitmapSetHeaderFormatSize], self) sstruct.unpack(sbixBitmapSetHeaderFormat, self.data[:sbixBitmapSetHeaderFormatSize], self)
# calculate number of bitmaps # calculate number of bitmaps
@ -92,7 +92,7 @@ class BitmapSet(object):
self.data += self.bitmapOffsets + self.bitmapData self.data += self.bitmapOffsets + self.bitmapData
def toXML(self, xmlWriter, ttFont): def toXML(self, xmlWriter, ttFont):
xmlWriter.begintag("bitmapSet") xmlWriter.begintag("strike")
xmlWriter.newline() xmlWriter.newline()
xmlWriter.simpletag("size", value=self.size) xmlWriter.simpletag("size", value=self.size)
xmlWriter.newline() xmlWriter.newline()
@ -103,7 +103,7 @@ class BitmapSet(object):
if glyphOrder[i] in self.bitmaps: if glyphOrder[i] in self.bitmaps:
self.bitmaps[glyphOrder[i]].toXML(xmlWriter, ttFont) self.bitmaps[glyphOrder[i]].toXML(xmlWriter, ttFont)
# TODO: what if there are more bitmaps than glyphs? # TODO: what if there are more bitmaps than glyphs?
xmlWriter.endtag("bitmapSet") xmlWriter.endtag("strike")
xmlWriter.newline() xmlWriter.newline()
def fromXML(self, name, attrs, content, ttFont): def fromXML(self, name, attrs, content, ttFont):