change xrange to range
parent
0a2d90c051
commit
f9a67db89b
|
@ -358,7 +358,7 @@ class CMapParser(PSStackParser):
|
||||||
e1 = nunpack(evar)
|
e1 = nunpack(evar)
|
||||||
vlen = len(svar)
|
vlen = len(svar)
|
||||||
#assert s1 <= e1
|
#assert s1 <= e1
|
||||||
for i in xrange(e1-s1+1):
|
for i in range(e1-s1+1):
|
||||||
x = sprefix+struct.pack('>L', s1+i)[-vlen:]
|
x = sprefix+struct.pack('>L', s1+i)[-vlen:]
|
||||||
self.cmap.add_code2cid(x, cid+i)
|
self.cmap.add_code2cid(x, cid+i)
|
||||||
return
|
return
|
||||||
|
@ -386,14 +386,14 @@ class CMapParser(PSStackParser):
|
||||||
e1 = nunpack(e)
|
e1 = nunpack(e)
|
||||||
#assert s1 <= e1
|
#assert s1 <= e1
|
||||||
if isinstance(code, list):
|
if isinstance(code, list):
|
||||||
for i in xrange(e1-s1+1):
|
for i in range(e1-s1+1):
|
||||||
self.cmap.add_cid2unichr(s1+i, code[i])
|
self.cmap.add_cid2unichr(s1+i, code[i])
|
||||||
else:
|
else:
|
||||||
var = code[-4:]
|
var = code[-4:]
|
||||||
base = nunpack(var)
|
base = nunpack(var)
|
||||||
prefix = code[:-4]
|
prefix = code[:-4]
|
||||||
vlen = len(var)
|
vlen = len(var)
|
||||||
for i in xrange(e1-s1+1):
|
for i in range(e1-s1+1):
|
||||||
x = prefix+struct.pack('>L', base+i)[-vlen:]
|
x = prefix+struct.pack('>L', base+i)[-vlen:]
|
||||||
self.cmap.add_cid2unichr(s1+i, x)
|
self.cmap.add_cid2unichr(s1+i, x)
|
||||||
return
|
return
|
||||||
|
|
|
@ -99,7 +99,7 @@ class PDFLayoutAnalyzer(PDFTextDevice):
|
||||||
# other shapes
|
# other shapes
|
||||||
pts = []
|
pts = []
|
||||||
for p in path:
|
for p in path:
|
||||||
for i in xrange(1, len(p), 2):
|
for i in range(1, len(p), 2):
|
||||||
pts.append(apply_matrix_pt(self.ctm, (p[i], p[i+1])))
|
pts.append(apply_matrix_pt(self.ctm, (p[i], p[i+1])))
|
||||||
self.cur_item.add(LTCurve(gstate.linewidth, pts))
|
self.cur_item.add(LTCurve(gstate.linewidth, pts))
|
||||||
return
|
return
|
||||||
|
@ -254,7 +254,7 @@ class HTMLConverter(PDFConverter):
|
||||||
|
|
||||||
def write_footer(self):
|
def write_footer(self):
|
||||||
self.write('<div style="position:absolute; top:0px;">Page: %s</div>\n' %
|
self.write('<div style="position:absolute; top:0px;">Page: %s</div>\n' %
|
||||||
', '.join('<a href="#%s">%s</a>' % (i, i) for i in xrange(1, self.pageno)))
|
', '.join('<a href="#%s">%s</a>' % (i, i) for i in range(1, self.pageno)))
|
||||||
self.write('</body></html>\n')
|
self.write('</body></html>\n')
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ def get_widths(seq):
|
||||||
r.append(v)
|
r.append(v)
|
||||||
if len(r) == 3:
|
if len(r) == 3:
|
||||||
(char1, char2, w) = r
|
(char1, char2, w) = r
|
||||||
for i in xrange(char1, char2+1):
|
for i in range(char1, char2+1):
|
||||||
widths[i] = w
|
widths[i] = w
|
||||||
r = []
|
r = []
|
||||||
return widths
|
return widths
|
||||||
|
@ -68,7 +68,7 @@ def get_widths2(seq):
|
||||||
r.append(v)
|
r.append(v)
|
||||||
if len(r) == 5:
|
if len(r) == 5:
|
||||||
(char1, char2, w, vx, vy) = r
|
(char1, char2, w, vx, vy) = r
|
||||||
for i in xrange(char1, char2+1):
|
for i in range(char1, char2+1):
|
||||||
widths[i] = (w, (vx, vy))
|
widths[i] = (w, (vx, vy))
|
||||||
r = []
|
r = []
|
||||||
return widths
|
return widths
|
||||||
|
@ -266,7 +266,7 @@ class CFFFont(object):
|
||||||
self.fp = fp
|
self.fp = fp
|
||||||
self.offsets = []
|
self.offsets = []
|
||||||
(count, offsize) = struct.unpack('>HB', self.fp.read(3))
|
(count, offsize) = struct.unpack('>HB', self.fp.read(3))
|
||||||
for i in xrange(count+1):
|
for i in range(count+1):
|
||||||
self.offsets.append(nunpack(self.fp.read(offsize)))
|
self.offsets.append(nunpack(self.fp.read(offsize)))
|
||||||
self.base = self.fp.tell()-1
|
self.base = self.fp.tell()-1
|
||||||
self.fp.seek(self.base+self.offsets[-1])
|
self.fp.seek(self.base+self.offsets[-1])
|
||||||
|
@ -283,7 +283,7 @@ class CFFFont(object):
|
||||||
return self.fp.read(self.offsets[i+1]-self.offsets[i])
|
return self.fp.read(self.offsets[i+1]-self.offsets[i])
|
||||||
|
|
||||||
def __iter__(self):
|
def __iter__(self):
|
||||||
return iter(self[i] for i in xrange(len(self)))
|
return iter(self[i] for i in range(len(self)))
|
||||||
|
|
||||||
def __init__(self, name, fp):
|
def __init__(self, name, fp):
|
||||||
self.name = name
|
self.name = name
|
||||||
|
@ -323,9 +323,9 @@ class CFFFont(object):
|
||||||
# Format 1
|
# Format 1
|
||||||
(n,) = struct.unpack('B', self.fp.read(1))
|
(n,) = struct.unpack('B', self.fp.read(1))
|
||||||
code = 0
|
code = 0
|
||||||
for i in xrange(n):
|
for i in range(n):
|
||||||
(first, nleft) = struct.unpack('BB', self.fp.read(2))
|
(first, nleft) = struct.unpack('BB', self.fp.read(2))
|
||||||
for gid in xrange(first, first+nleft+1):
|
for gid in range(first, first+nleft+1):
|
||||||
self.code2gid[code] = gid
|
self.code2gid[code] = gid
|
||||||
self.gid2code[gid] = code
|
self.gid2code[gid] = code
|
||||||
code += 1
|
code += 1
|
||||||
|
@ -348,9 +348,9 @@ class CFFFont(object):
|
||||||
# Format 1
|
# Format 1
|
||||||
(n,) = struct.unpack('B', self.fp.read(1))
|
(n,) = struct.unpack('B', self.fp.read(1))
|
||||||
sid = 0
|
sid = 0
|
||||||
for i in xrange(n):
|
for i in range(n):
|
||||||
(first, nleft) = struct.unpack('BB', self.fp.read(2))
|
(first, nleft) = struct.unpack('BB', self.fp.read(2))
|
||||||
for gid in xrange(first, first+nleft+1):
|
for gid in range(first, first+nleft+1):
|
||||||
name = self.getstr(sid)
|
name = self.getstr(sid)
|
||||||
self.name2gid[name] = gid
|
self.name2gid[name] = gid
|
||||||
self.gid2name[gid] = name
|
self.gid2name[gid] = name
|
||||||
|
@ -384,7 +384,7 @@ class TrueTypeFont(object):
|
||||||
self.tables = {}
|
self.tables = {}
|
||||||
self.fonttype = fp.read(4)
|
self.fonttype = fp.read(4)
|
||||||
(ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))
|
(ntables, _1, _2, _3) = struct.unpack('>HHHH', fp.read(8))
|
||||||
for _ in xrange(ntables):
|
for _ in range(ntables):
|
||||||
(name, tsum, offset, length) = struct.unpack('>4sLLL', fp.read(16))
|
(name, tsum, offset, length) = struct.unpack('>4sLLL', fp.read(16))
|
||||||
self.tables[name] = (offset, length)
|
self.tables[name] = (offset, length)
|
||||||
return
|
return
|
||||||
|
@ -397,7 +397,7 @@ class TrueTypeFont(object):
|
||||||
fp.seek(base_offset)
|
fp.seek(base_offset)
|
||||||
(version, nsubtables) = struct.unpack('>HH', fp.read(4))
|
(version, nsubtables) = struct.unpack('>HH', fp.read(4))
|
||||||
subtables = []
|
subtables = []
|
||||||
for i in xrange(nsubtables):
|
for i in range(nsubtables):
|
||||||
subtables.append(struct.unpack('>HHL', fp.read(8)))
|
subtables.append(struct.unpack('>HHL', fp.read(8)))
|
||||||
char2gid = {}
|
char2gid = {}
|
||||||
# Only supports subtable type 0, 2 and 4.
|
# Only supports subtable type 0, 2 and 4.
|
||||||
|
@ -413,7 +413,7 @@ class TrueTypeFont(object):
|
||||||
firstbytes[k//8] = i
|
firstbytes[k//8] = i
|
||||||
nhdrs = max(subheaderkeys)//8 + 1
|
nhdrs = max(subheaderkeys)//8 + 1
|
||||||
hdrs = []
|
hdrs = []
|
||||||
for i in xrange(nhdrs):
|
for i in range(nhdrs):
|
||||||
(firstcode, entcount, delta, offset) = struct.unpack('>HHhH', fp.read(8))
|
(firstcode, entcount, delta, offset) = struct.unpack('>HHhH', fp.read(8))
|
||||||
hdrs.append((i, firstcode, entcount, delta, fp.tell()-2+offset))
|
hdrs.append((i, firstcode, entcount, delta, fp.tell()-2+offset))
|
||||||
for (i, firstcode, entcount, delta, pos) in hdrs:
|
for (i, firstcode, entcount, delta, pos) in hdrs:
|
||||||
|
@ -421,7 +421,7 @@ class TrueTypeFont(object):
|
||||||
continue
|
continue
|
||||||
first = firstcode + (firstbytes[i] << 8)
|
first = firstcode + (firstbytes[i] << 8)
|
||||||
fp.seek(pos)
|
fp.seek(pos)
|
||||||
for c in xrange(entcount):
|
for c in range(entcount):
|
||||||
gid = struct.unpack('>H', fp.read(2))
|
gid = struct.unpack('>H', fp.read(2))
|
||||||
if gid:
|
if gid:
|
||||||
gid += delta
|
gid += delta
|
||||||
|
@ -438,10 +438,10 @@ class TrueTypeFont(object):
|
||||||
for (ec, sc, idd, idr) in zip(ecs, scs, idds, idrs):
|
for (ec, sc, idd, idr) in zip(ecs, scs, idds, idrs):
|
||||||
if idr:
|
if idr:
|
||||||
fp.seek(pos+idr)
|
fp.seek(pos+idr)
|
||||||
for c in xrange(sc, ec+1):
|
for c in range(sc, ec+1):
|
||||||
char2gid[c] = (struct.unpack('>H', fp.read(2))[0] + idd) & 0xffff
|
char2gid[c] = (struct.unpack('>H', fp.read(2))[0] + idd) & 0xffff
|
||||||
else:
|
else:
|
||||||
for c in xrange(sc, ec+1):
|
for c in range(sc, ec+1):
|
||||||
char2gid[c] = (c + idd) & 0xffff
|
char2gid[c] = (c + idd) & 0xffff
|
||||||
else:
|
else:
|
||||||
assert 0
|
assert 0
|
||||||
|
|
Loading…
Reference in New Issue