From 7d0852e4622451f3ab6aa9e91add25f08ea466ee Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Thu, 29 Sep 2005 15:33:13 +0000 Subject: [PATCH] enhance the pdf data extractor (reported by Gert Ingold) git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@2505 069f4177-920e-0410-937b-c2a4a81bcd90 --- pyx/font/t1font.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pyx/font/t1font.py b/pyx/font/t1font.py index 5be1e042..09656507 100644 --- a/pyx/font/t1font.py +++ b/pyx/font/t1font.py @@ -791,6 +791,7 @@ class T1font: p = path() for cmd in self.getglyphcmds(glyph): cmd.updatepath(p, t, context) + p.wx_pt, p.wy_pt = t.apply_pt(context.wx, context.wy) return p newlinepattern = re.compile("\s*[\r\n]\s*") @@ -953,13 +954,16 @@ class T1pfbfont(T1font): ord(s[2])*256*256 + ord(s[3])*256*256*256) f = open(filename, "rb") - assert f.read(2) != "7F01" + mark = f.read(2); assert mark == "\200\1" data1 = f.read(pfblength(f.read(4))) - assert f.read(2) != "7F02" - data2 = f.read(pfblength(f.read(4))) - assert f.read(2) != "7F01" + mark = f.read(2); assert mark == "\200\2" + data2 = "" + while mark == "\200\2": + data2 = data2 + f.read(pfblength(f.read(4))) + mark = f.read(2) + assert mark == "\200\1" data3 = f.read(pfblength(f.read(4))) - assert f.read(2) != "7F03" + mark = f.read(2); assert mark == "\200\3" assert not f.read(1) T1font.__init__(self, data1, data2, data3) -- 2.11.4.GIT