using arrays instead of tuples for linematrix in textstate

This commit is contained in:
ari committed 2018-10-28 14:40:05 -04:00
1 parent 9fb0efd510
commit b23df00569
3 files changed
+12 -14

No files matched your search

+4 -4
View File
@@ -468,7 +468,7 @@ class PDFPageInterpreter(object):
def do_Td(self, tx, ty):
(a, b, c, d, e, f) = self.textstate.matrix
self.textstate.matrix = (a, b, c, d, tx*a+ty*c+e, tx*b+ty*d+f)
self.textstate.linematrix = (0, 0)
self.textstate.linematrix = [0, 0]
return
# text-move
@@ -476,20 +476,20 @@ class PDFPageInterpreter(object):
(a, b, c, d, e, f) = self.textstate.matrix
self.textstate.matrix = (a, b, c, d, tx*a+ty*c+e, tx*b+ty*d+f)
self.textstate.leading = ty
self.textstate.linematrix = (0, 0)
self.textstate.linematrix = [0, 0]
return
# textmatrix
def do_Tm(self, a, b, c, d, e, f):
self.textstate.matrix = (a, b, c, d, e, f)
self.textstate.linematrix = (0, 0)
self.textstate.linematrix = [0, 0]
return
# nextline
def do_T_a(self):
(a, b, c, d, e, f) = self.textstate.matrix
self.textstate.matrix = (a, b, c, d, self.textstate.leading*c+e, self.textstate.leading*d+f)
self.textstate.linematrix = (0, 0)
self.textstate.linematrix = [0, 0]
return
# show-pos
+1 -1
View File
@@ -44,7 +44,7 @@ class PDFTextState(object):
def reset(self):
self.matrix = MATRIX_IDENTITY
self.linematrix = (0, 0)
self.linematrix = [0, 0]
return
@property
+7 -9
View File
@@ -82,33 +82,32 @@ class PDFTextDevice(PDFDevice):
dxscale = .001 * textstate.fontsize * textstate.scaling
if textstate.font.is_vertical():
textstate.linematrix = self.__render_string_along(1,
self.__render_string_along(1,
seq, textstate, dxscale, ncs, graphicstate
)
else:
textstate.linematrix = self.__render_string_along(0,
self.__render_string_along(0,
seq, textstate, dxscale, ncs, graphicstate
)
def __render_string_along(self, idx: int, seq: bytearray,
textstate: PDFTextState, dxscale: float, ncs: PDFColorSpace, graphicstate: PDFGraphicState):
needcharspace = False
pos_copy = [*textstate.linematrix]
for obj in seq:
if isnumber(obj):
pos_copy[idx] -= obj*dxscale
textstate.linematrix[idx] -= obj*dxscale
needcharspace = True
else:
for cid in textstate.font.decode(obj):
if needcharspace:
pos_copy[idx] += textstate.charspace
textstate.linematrix[idx] += textstate.charspace
text = textstate.font.to_unichr(cid)
assert isinstance(text, str), str(type(text))
matrix = translate_matrix(textstate.matrix, pos_copy)
matrix = translate_matrix(textstate.matrix, textstate.linematrix)
adv, bbox = self.__compute_char_bbox(matrix, cid, textstate)
pos_copy[idx] += adv
textstate.linematrix[idx] += adv
self.render_char(
text,
@@ -118,9 +117,8 @@ class PDFTextDevice(PDFDevice):
ncs
)
if cid == 32 and textstate.wordspace:
pos_copy[idx] += textstate.wordspace
textstate.linematrix[idx] += textstate.wordspace
needcharspace = True
return pos_copy
def __compute_char_bbox(self, matrix, char_id: int, textstate: PDFTextState):
font = textstate.font