rename: LTPolygon -> LTCurve
parent
dab70855bf
commit
0e660dd385
|
@ -4,7 +4,7 @@ from pdfdevice import PDFDevice, PDFTextDevice
|
||||||
from pdffont import PDFUnicodeNotDefined
|
from pdffont import PDFUnicodeNotDefined
|
||||||
from pdftypes import LITERALS_DCT_DECODE
|
from pdftypes import LITERALS_DCT_DECODE
|
||||||
from pdfcolor import LITERAL_DEVICE_GRAY, LITERAL_DEVICE_RGB
|
from pdfcolor import LITERAL_DEVICE_GRAY, LITERAL_DEVICE_RGB
|
||||||
from layout import LTContainer, LTPage, LTText, LTLine, LTRect, LTPolygon
|
from layout import LTContainer, LTPage, LTText, LTLine, LTRect, LTCurve
|
||||||
from layout import LTFigure, LTImage, LTChar, LTTextLine
|
from layout import LTFigure, LTImage, LTChar, LTTextLine
|
||||||
from layout import LTTextBox, LTTextBoxVertical, LTTextGroup
|
from layout import LTTextBox, LTTextBoxVertical, LTTextGroup
|
||||||
from utils import apply_matrix_pt, mult_matrix
|
from utils import apply_matrix_pt, mult_matrix
|
||||||
|
@ -91,7 +91,7 @@ class PDFLayoutAnalyzer(PDFTextDevice):
|
||||||
for p in path:
|
for p in path:
|
||||||
for i in xrange(1, len(p), 2):
|
for i in xrange(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(LTPolygon(gstate.linewidth, pts))
|
self.cur_item.add(LTCurve(gstate.linewidth, pts))
|
||||||
return
|
return
|
||||||
|
|
||||||
def render_char(self, matrix, font, fontsize, scaling, rise, cid):
|
def render_char(self, matrix, font, fontsize, scaling, rise, cid):
|
||||||
|
@ -213,7 +213,7 @@ class HTMLConverter(PDFConverter):
|
||||||
'textline': 'magenta',
|
'textline': 'magenta',
|
||||||
'textbox': 'cyan',
|
'textbox': 'cyan',
|
||||||
'textgroup': 'red',
|
'textgroup': 'red',
|
||||||
'polygon': 'black',
|
'curve': 'black',
|
||||||
'page': 'gray',
|
'page': 'gray',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -225,7 +225,7 @@ class HTMLConverter(PDFConverter):
|
||||||
def __init__(self, rsrcmgr, outfp, codec='utf-8', pageno=1, laparams=None,
|
def __init__(self, rsrcmgr, outfp, codec='utf-8', pageno=1, laparams=None,
|
||||||
scale=1, fontscale=0.7, layoutmode='normal', showpageno=True,
|
scale=1, fontscale=0.7, layoutmode='normal', showpageno=True,
|
||||||
pagemargin=50, outdir=None,
|
pagemargin=50, outdir=None,
|
||||||
rect_colors={'polygon':'black', 'page':'gray'},
|
rect_colors={'curve':'black', 'page':'gray'},
|
||||||
text_colors={'char':'black'}):
|
text_colors={'char':'black'}):
|
||||||
PDFConverter.__init__(self, rsrcmgr, outfp, codec=codec, pageno=pageno, laparams=laparams)
|
PDFConverter.__init__(self, rsrcmgr, outfp, codec=codec, pageno=pageno, laparams=laparams)
|
||||||
self.scale = scale
|
self.scale = scale
|
||||||
|
@ -349,8 +349,8 @@ class HTMLConverter(PDFConverter):
|
||||||
render(child)
|
render(child)
|
||||||
if item.layout:
|
if item.layout:
|
||||||
show_layout(item.layout)
|
show_layout(item.layout)
|
||||||
elif isinstance(item, LTPolygon):
|
elif isinstance(item, LTCurve):
|
||||||
self.place_border('polygon', 1, item)
|
self.place_border('curve', 1, item)
|
||||||
elif isinstance(item, LTFigure):
|
elif isinstance(item, LTFigure):
|
||||||
self.place_border('figure', 1, item)
|
self.place_border('figure', 1, item)
|
||||||
for child in item:
|
for child in item:
|
||||||
|
@ -448,8 +448,8 @@ class XMLConverter(PDFConverter):
|
||||||
elif isinstance(item, LTRect):
|
elif isinstance(item, LTRect):
|
||||||
self.outfp.write('<rect linewidth="%d" bbox="%s" />\n' %
|
self.outfp.write('<rect linewidth="%d" bbox="%s" />\n' %
|
||||||
(item.linewidth, bbox2str(item.bbox)))
|
(item.linewidth, bbox2str(item.bbox)))
|
||||||
elif isinstance(item, LTPolygon):
|
elif isinstance(item, LTCurve):
|
||||||
self.outfp.write('<polygon linewidth="%d" bbox="%s" pts="%s"/>\n' %
|
self.outfp.write('<curve linewidth="%d" bbox="%s" pts="%s"/>\n' %
|
||||||
(item.linewidth, bbox2str(item.bbox), item.get_pts()))
|
(item.linewidth, bbox2str(item.bbox), item.get_pts()))
|
||||||
elif isinstance(item, LTFigure):
|
elif isinstance(item, LTFigure):
|
||||||
self.outfp.write('<figure name="%s" bbox="%s">\n' %
|
self.outfp.write('<figure name="%s" bbox="%s">\n' %
|
||||||
|
|
|
@ -92,9 +92,9 @@ class LTItem(object):
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
|
|
||||||
## LTPolygon
|
## LTCurve
|
||||||
##
|
##
|
||||||
class LTPolygon(LTItem):
|
class LTCurve(LTItem):
|
||||||
|
|
||||||
def __init__(self, linewidth, pts):
|
def __init__(self, linewidth, pts):
|
||||||
self.pts = pts
|
self.pts = pts
|
||||||
|
@ -108,19 +108,19 @@ class LTPolygon(LTItem):
|
||||||
|
|
||||||
## LTLine
|
## LTLine
|
||||||
##
|
##
|
||||||
class LTLine(LTPolygon):
|
class LTLine(LTCurve):
|
||||||
|
|
||||||
def __init__(self, linewidth, p0, p1):
|
def __init__(self, linewidth, p0, p1):
|
||||||
LTPolygon.__init__(self, linewidth, [p0, p1])
|
LTCurve.__init__(self, linewidth, [p0, p1])
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
## LTRect
|
## LTRect
|
||||||
##
|
##
|
||||||
class LTRect(LTPolygon):
|
class LTRect(LTCurve):
|
||||||
|
|
||||||
def __init__(self, linewidth, (x0,y0,x1,y1)):
|
def __init__(self, linewidth, (x0,y0,x1,y1)):
|
||||||
LTPolygon.__init__(self, linewidth, [(x0,y0), (x1,y0), (x1,y1), (x0,y1)])
|
LTCurve.__init__(self, linewidth, [(x0,y0), (x1,y0), (x1,y1), (x0,y1)])
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue