support bdf version 2.2

This commit is contained in:
copyliu 2014-10-13 15:55:12 +08:00
parent 838afa1528
commit 6598ab4003

View File

@ -17,6 +17,7 @@
# See the README file for information on usage and redistribution.
#
from PIL import Image
from PIL import FontFile
@ -41,7 +42,59 @@ bdf_spacing = {
}
def bdf_char(f):
##
# Font file plugin for the X11 BDF format.
class BdfFontFile(FontFile.FontFile):
props = {}
comments = []
def __init__(self, fp):
FontFile.FontFile.__init__(self)
self.glyph = [None] * 65536
s = fp.readline()
if s[:13] != b"STARTFONT 2.1" and s[:13] != b"STARTFONT 2.2":
raise SyntaxError("not a valid BDF file")
while True:
s = fp.readline()
if not s or s[:13] == b"ENDPROPERTIES":
break
i = s.find(b" ")
self.props[s[:i].decode('ascii')] = s[i+1:-1].decode('ascii')
if s[:i] in [b"COMMENT", b"COPYRIGHT"]:
if s.find(b"LogicalFontDescription") < 0:
self.comments.append(s[i+1:-1].decode('ascii'))
font = self.props["FONT"].split("-")
font[4] = bdf_slant[font[4].upper()]
font[11] = bdf_spacing[font[11].upper()]
# ascent = int(props["FONT_ASCENT"])
# descent = int(props["FONT_DESCENT"])
# fontname = ";".join(font[1:])
# print "#", fontname
# for i in comments:
# print "#", i
font = []
while True:
c = self.bdf_char(fp)
if not c:
break
id, ch, (xy, dst, src), im = c
if 0 <= ch < len(self.glyph):
self.glyph[ch] = xy, dst, src, im
def bdf_char(self,f):
# skip to STARTCHAR
while True:
s = f.readline()
@ -70,7 +123,10 @@ def bdf_char(f):
bitmap = b"".join(bitmap)
[x, y, l, d] = [int(s) for s in props["BBX"].split()]
if props.has_key("DWIDTH"):
[dx, dy] = [int(s) for s in props["DWIDTH"].split()]
else:
[dx, dy] = [int(s) for s in self.props["DWIDTH"].split()]
bbox = (dx, dy), (l, -d-y, x+l, -d), (0, 0, x, y)
@ -82,52 +138,3 @@ def bdf_char(f):
return id, int(props["ENCODING"]), bbox, im
##
# Font file plugin for the X11 BDF format.
class BdfFontFile(FontFile.FontFile):
def __init__(self, fp):
FontFile.FontFile.__init__(self)
s = fp.readline()
if s[:13] != b"STARTFONT 2.1":
raise SyntaxError("not a valid BDF file")
props = {}
comments = []
while True:
s = fp.readline()
if not s or s[:13] == b"ENDPROPERTIES":
break
i = s.find(b" ")
props[s[:i].decode('ascii')] = s[i+1:-1].decode('ascii')
if s[:i] in [b"COMMENT", b"COPYRIGHT"]:
if s.find(b"LogicalFontDescription") < 0:
comments.append(s[i+1:-1].decode('ascii'))
font = props["FONT"].split("-")
font[4] = bdf_slant[font[4].upper()]
font[11] = bdf_spacing[font[11].upper()]
# ascent = int(props["FONT_ASCENT"])
# descent = int(props["FONT_DESCENT"])
# fontname = ";".join(font[1:])
# print "#", fontname
# for i in comments:
# print "#", i
font = []
while True:
c = bdf_char(fp)
if not c:
break
id, ch, (xy, dst, src), im = c
if 0 <= ch < len(self.glyph):
self.glyph[ch] = xy, dst, src, im