From 0345ca01bad45c47493e072482fe30e4551c7bba Mon Sep 17 00:00:00 2001 From: Ariel Sosnovsky Date: Wed, 16 Jan 2019 16:55:30 -0500 Subject: [PATCH] - slightly more accurate shape detection --- pdfmajor/converters/html.py | 132 +++++++++++++++--- pdfmajor/converters/writers/html.py | 5 +- pdfmajor/interpreter/commands/__init__.py | 2 - pdfmajor/interpreter/commands/commands.py | 28 ++-- pdfmajor/interpreter/commands/state/Curves.py | 8 +- pdfmajor/utils/types.py | 6 + tests/samples/pdf/shapes.pdf | Bin 0 -> 6977 bytes 7 files changed, 142 insertions(+), 39 deletions(-) create mode 100644 tests/samples/pdf/shapes.pdf diff --git a/pdfmajor/converters/html.py b/pdfmajor/converters/html.py index 471cd71..baca8e4 100644 --- a/pdfmajor/converters/html.py +++ b/pdfmajor/converters/html.py @@ -43,19 +43,21 @@ def convert_to_html( render_page(html, page) def render_page(html: HTMLMaker, ltpage: PageInterpreter): - def render(item: LTItem): + def render(item: LTItem, block = True): if isinstance(item, LTCurve): - render_curve(html, item) + render_curve(html, ltpage, item) elif isinstance(item, LTXObject): with html.elm('div', { "class": 'xobject' }, { - 'position': 'absolute', + # 'position': 'absolute', 'left': f'{item.x0}px', + 'right': f'{item.x1}px', 'bottom': f'{item.y0}px', + 'top': f'{item.y1}px', 'width': f'{item.width}px', 'height': f'{item.height}px', }): for child in item: - render(child) + render(child, False) elif isinstance(item, LTImage): name = item.name # if html.imagewriter is not None: @@ -68,12 +70,12 @@ def render_page(html: HTMLMaker, ltpage: PageInterpreter): }) elif isinstance(item, LTChar): with html.elm('span', { 'class': 'char' }, { - 'width': item.width, - 'min-width': item.width, - 'max-width': item.width, - 'height': item.height, - 'min-height': item.height, - 'max-height': item.height, + 'width': str(item.width) + "px", + 'min-width': str(item.width) + "px", + 'max-width': str(item.width) + "px", + 'height': str(item.height) + "px", + 'min-height': str(item.height) + "px", + 'max-height': str(item.height) + "px", }): html.write(item.get_text()) elif isinstance(item, LTTextBlock): @@ -89,12 +91,12 @@ def render_page(html: HTMLMaker, ltpage: PageInterpreter): 'font-family': item.fontname, 'font-weight': item.font.font_weight, 'color': get_color(item.color, default="black"), - 'width': item.width, - 'min-width': item.width, - 'max-width': item.width, - 'height': item.height, - 'min-height': item.height, - 'max-height': item.height, + 'width': str(item.width) + "px", + 'min-width': str(item.width) + "px", + 'max-width': str(item.width) + "px", + 'height': str(item.height) + "px", + 'min-height': str(item.height) + "px", + 'max-height': str(item.height) + "px", 'transform': f'skew({item.font.italic_angle}deg, 0deg)', 'text-align': 'center', 'display': 'flex', @@ -125,11 +127,101 @@ def get_color(col: PDFColor, default: str = ""): else: return default -def render_curve(html: HTMLMaker, item: LTCurve): +def render_curve(html: HTMLMaker, ltpage: PageInterpreter, item: LTCurve): + path, svg_attr = create_svg_path(item) + + stroke_col = get_color(item.stroke) + fill_col = get_color(item.fill) + path_css = {} + if fill_col: + path_css['fill'] = fill_col + if stroke_col: + path_css['stroke'] = stroke_col + + with html.elm('svg', svg_attr, css={ + 'border': '1px solid black', + 'position': 'absolute', + 'left': f'{item.x0}px', + 'bottom': f'{ltpage.height - item.y0}px', + 'top': f'{ltpage.height - item.y1}px', + 'right': f'{item.x1}px', + 'width': f'{item.width}px', + 'height': f'{item.height}px', + }) as svg: + html.singleton('path', { + "d": path, + **path_css + }, { + **path_css + }) + +def create_svg_path(item: LTCurve): + css = { + 'position': 'absolute', + 'left': f'{item.x0}px', + 'bottom': f'{item.y0}px', + } + path = "" + svg_attr = { + 'class': 'curve', + 'z-index': 2 + } + + if item.height > 0: + dy = 1.0/item.height + dx = (item.width/item.height)/(item.x1-item.x0) + svg_attr.update({ + "viewBox": "0 0 %s %s" % ( item.width/item.height, 1 ) + }) + else: + dx = 1.0/(item.x1-item.x0) + dy = 1.0 + svg_attr.update({ + "viewBox": "0 0 1 1" + }) + + if item.height > 1: + svg_attr.update({ + 'height': f'{item.height}px', + }) + else: + svg_attr.update({ + 'height': '1px', + }) + + if item.width > 1: + svg_attr.update({ + 'width': f'{item.width}px', + }) + else: + svg_attr.update({ + 'width': '1px', + }) + + def pX(val: float) -> float: + return ( val-item.x0 )*dx + def pY(val: float) -> float: + return ( item.height- (val-item.y0) )*dy + + for p in item.paths: + if p.method == CurvePath.METHOD.MOVE_TO: + path += f'M{" ".join( f"{pX(p.x)} {pY(p.y)}" for p in p.points )} ' + elif p.method == CurvePath.METHOD.LINE_TO: + path += f'L{" ".join( f"{pX(p.x)} {pY(p.y)}" for p in p.points )} ' + elif p.method == CurvePath.METHOD.CLOSE_PATH: + path += 'Z' + elif p.method == CurvePath.METHOD.CURVE_BOTH_TO: + path += f'C{" ".join( f"{pX(pt.x)} {pY(pt.y)}" for pt in p.points )} ' + + return path, svg_attr + +def __render_curve(html: HTMLMaker, ltpage: PageInterpreter, item: LTCurve): css = { 'position': 'absolute', 'left': f'{item.x0}px', 'bottom': f'{item.y0}px', + 'top': f'{item.y1}px', + 'right': f'{item.x1}px', 'width': f'{item.width}px', 'height': f'{item.height}px', } @@ -172,10 +264,12 @@ def render_curve(html: HTMLMaker, item: LTCurve): for p in item.paths: if p.method == CurvePath.METHOD.MOVE_TO: path += f'M{" ".join( f"{round(dx*pt.x, ROUND_VAL)} {round(dy*pt.y, ROUND_VAL)}" for pt in p.points )} ' - if p.method == CurvePath.METHOD.LINE_TO: + elif p.method == CurvePath.METHOD.LINE_TO: path += f'L{" ".join( f"{round(dx*pt.x, ROUND_VAL)} {round(dy*pt.y, ROUND_VAL)}" for pt in p.points )} ' - if p.method == CurvePath.METHOD.CLOSE_PATH: + elif p.method == CurvePath.METHOD.CLOSE_PATH: path += 'Z' + elif p.method == CurvePath.METHOD.CURVE_BOTH_TO: + path += f'C{" ".join( f"{round(dx*pt.x, ROUND_VAL)} {round(dy*pt.y, ROUND_VAL)}" for pt in p.points )} ' stroke_col = get_color(item.stroke) fill_col = get_color(item.fill) diff --git a/pdfmajor/converters/writers/html.py b/pdfmajor/converters/writers/html.py index 391a727..f57d4d4 100644 --- a/pdfmajor/converters/writers/html.py +++ b/pdfmajor/converters/writers/html.py @@ -56,7 +56,6 @@ class HTMLMaker: self.write(f"<{tag_name} {attrs} />", lineend=lineend, deep_space=deep_space) yield - def singleton(self, tag_name: str, attrs: dict = None, css: dict = None): - with self.elm(tag_name, attrs, css, singleton=True): + def singleton(self, tag_name: str, attrs: dict = None, css: dict = None, singleton: bool = True): + with self.elm(tag_name, attrs, css, singleton=singleton): pass - \ No newline at end of file diff --git a/pdfmajor/interpreter/commands/__init__.py b/pdfmajor/interpreter/commands/__init__.py index 3a34b4b..bcbc71c 100644 --- a/pdfmajor/interpreter/commands/__init__.py +++ b/pdfmajor/interpreter/commands/__init__.py @@ -20,8 +20,6 @@ log = get_logger('process_command_stream') class CommandProcessorError(Exception): pass def process_command_stream(streams: List[PDFStream], font_cache: dict = None, state: PDFStateStack = None): - if state is None: - state = PDFStateStack() if font_cache is None: font_cache = {} parser = PDFContentParser(streams) diff --git a/pdfmajor/interpreter/commands/commands.py b/pdfmajor/interpreter/commands/commands.py index 814e346..6aec062 100644 --- a/pdfmajor/interpreter/commands/commands.py +++ b/pdfmajor/interpreter/commands/commands.py @@ -116,7 +116,7 @@ def do_i(stack: PDFStateStack, flatness) -> PDFStateStack: def do_m(stack: PDFStateStack, x: float, y: float) -> PDFStateStack: stack.curvestacks.append(CurvePath( CurvePath.METHOD.MOVE_TO, - CurvePoint(x, y) + CurvePoint(stack.t_matrix, x, y) )) return stack @@ -125,7 +125,7 @@ def do_m(stack: PDFStateStack, x: float, y: float) -> PDFStateStack: def do_l(stack: PDFStateStack, x: float, y: float) -> PDFStateStack: stack.curvestacks.append(CurvePath( CurvePath.METHOD.LINE_TO, - CurvePoint(x, y) + CurvePoint(stack.t_matrix, x, y) )) return stack @@ -137,9 +137,9 @@ def do_c(stack: PDFStateStack, x3: float, y3: float ) -> PDFStateStack: stack.curvestacks.append(CurvePath( CurvePath.METHOD.CURVE_BOTH_TO, - CurvePoint(x1, y1), - CurvePoint(x2, y2), - CurvePoint(x3, y3), + CurvePoint(stack.t_matrix, x1, y1), + CurvePoint(stack.t_matrix, x2, y2), + CurvePoint(stack.t_matrix, x3, y3), )) return stack @@ -150,8 +150,8 @@ def do_v(stack: PDFStateStack, x3: float, y3: float) -> PDFStateStack: stack.curvestacks.append(CurvePath( CurvePath.METHOD.CURVE_NEXT_TO, - CurvePoint(x2, y2), - CurvePoint(x3, y3), + CurvePoint(stack.t_matrix, x2, y2), + CurvePoint(stack.t_matrix, x3, y3), )) return stack @@ -162,8 +162,8 @@ def do_y(stack: PDFStateStack, x3: float, y3: float) -> PDFStateStack: stack.curvestacks.append(CurvePath( CurvePath.METHOD.CURVE_FIRST_TO, - CurvePoint(x1, y1), - CurvePoint(x3, y3) + CurvePoint(stack.t_matrix, x1, y1), + CurvePoint(stack.t_matrix, x3, y3) )) return stack @@ -177,10 +177,10 @@ def do_h(stack: PDFStateStack) -> PDFStateStack: @PDFCommands.add('re') def do_re(stack: PDFStateStack, x, y, w, h) -> PDFStateStack: stack.curvestacks.extend([ - CurvePath(CurvePath.METHOD.MOVE_TO, CurvePoint(x, y) ), - CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(x+w, y) ), - CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(x+w, y+h) ), - CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(x, y+h) ), + CurvePath(CurvePath.METHOD.MOVE_TO, CurvePoint(stack.t_matrix, x, y) ), + CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(stack.t_matrix, x+w, y) ), + CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(stack.t_matrix, x+w, y+h) ), + CurvePath(CurvePath.METHOD.LINE_TO, CurvePoint(stack.t_matrix, x, y+h) ), CurvePath(CurvePath.METHOD.CLOSE_PATH) ]) return stack @@ -476,7 +476,7 @@ def do__w(stack: PDFStateStack, wordspace, charspace, b) -> PDFStateStack: def do_EI(stack: PDFStateStack, obj) -> PDFStateStack: if 'W' in obj and 'H' in obj: stack.complete_layout_items.append(make_image( - obj, stack.ctm + obj, stack.t_matrix )) return stack diff --git a/pdfmajor/interpreter/commands/state/Curves.py b/pdfmajor/interpreter/commands/state/Curves.py index ba9f9d5..0ad4cd7 100644 --- a/pdfmajor/interpreter/commands/state/Curves.py +++ b/pdfmajor/interpreter/commands/state/Curves.py @@ -1,8 +1,14 @@ from enum import Enum from typing import List +from pdfmajor.utils import apply_matrix_pt class CurvePoint: - def __init__(self, x: float, y: float): + def __init__(self, ctm: tuple, x: float, y: float): + # old = (x,y) + # (x, y) = apply_matrix_pt(ctm, (x, y)) + # if old != (x,y): + # print("CurvePoint", ctm, old) + # print(" >", x, y) self.x = x self.y = y diff --git a/pdfmajor/utils/types.py b/pdfmajor/utils/types.py index a32bf1b..f649e53 100644 --- a/pdfmajor/utils/types.py +++ b/pdfmajor/utils/types.py @@ -13,6 +13,12 @@ class Bbox: self.x1 = x1 self.y0 = y0 self.y1 = y1 + if (x0 is not None) and (x1 is not None): + self.x0 = min([x0,x1]) + self.x1 = max([x0,x1]) + if (y0 is not None) and (y1 is not None): + self.y0 = min([y0,y1]) + self.y1 = max([y0,y1]) @property def height(self) -> float: diff --git a/tests/samples/pdf/shapes.pdf b/tests/samples/pdf/shapes.pdf new file mode 100644 index 0000000000000000000000000000000000000000..0a122f3c50cd8846c59267455dfd195a8f87b632 GIT binary patch literal 6977 zcmai32UHVF+g6Hb1Ox=6sX;-ImPP`h*HEMeP+HIcp*Isch|+uSMVf#jT@a;rkR~E3 zQUnA91u04g!GGhu->u(w{yk@RXWyB5>oc?GJj1J_gb{{`AVItx1s#nYwH-MiI2a0c zHn#&wNkKFSPS&nAU<4q+LNK-tt^^_kiptcZrB6gZ5UizC7e`U#oVI)tI5tGp^FXD&fb1Y~m^I4wNs& zac(vL&L|{ezW(5@bZ`T^FI5Pt*^FW@q1ETTW76=r+%xyM!65tU4>6sqW)URPli6OXRX~^rlYdEYk7XOf&;o~-H)}j22dH& zoT=sgIv#%0CLVk|cB_)Aw!o&F;k70#(?OBhFfpmf%i;7xz6rV@Aq#Mui~Ct?AFa%S zk3rQFSx(yZU72@8ZS#u0Tyg9O@NUtzz&8fTjvtN2TQ4-Ptu^fUbuDWp`} zxY6ioo62LY2gfX(Tv7$rS1w+^Bz>xNC6i!GM)GuzH zY`qyB@=0eWB-Q@-*FCnmY<`fhShFprnR<_Rn0qV!M%@|~=v_qL z$)nHyd*R{VxtyUHGe6hxzSFxhQdW~Ryp^FiXEg0{E}J{0rHJ0@!dCafPZQ>puPd}a z7_{1lP4o{wo>}*vWgRnFPhA&yU=|SQangrAX88@?^LX|T^@j87;@w{C8`DzzI`uT! zJp*&=(p*VhozX@fOXIOKA0|RC$?~nWSFeMNWlmdv+h%(=?F8vP!zbF$>NhZkV7A2Ys8zN8QQbx{l|NjWwP1iIK1$SEDw#I%n`- z3s#;*!gJaLIx6yJx~JPs8c$crpM}7T)Z7NC8HTfP3IhI{K2;f$^LN_YIal%s zmMMivPm_o#og$)gl$zY2@nBY6Ha?U3L)D88jFbWH!NWU06J2hJHg z1tZ#aF#?Y1@AHLyHd6`DzgJ!tuJx=D;CR}^m-_I~NkHo5pz@?-` zG3vq}@4HyR$!%k(V#b<6Swc-9N4> zt2IhL&Nf`m;`dSL+z9D>`*{7aY8D0q6aFhU-ReS2-h-~Kb$KGTk`|zr7gOcpF!@4@ z^2+O-P|+Bb&CM@&8}bQka;*x_t`lhRi8m9C3K?WKhm;f8{w5&5S%AybgK0Ysbm-DDQ#?2{AZLE9PC<4tja5AYufAMQ|y9G56-?_m}Y z63-bd(@?TE!i1WwN8({%;K#D`edOuz_ez1~u3N}apQm3~oiJ6E8agpcwjr!~8`sg+ ztT!fJ>~c*=T>F43V|~q9)g-1F80jr1H}A;tiZSJ#c-B`VIkB3sA+xp^lMKhtn`u15 zgIqY3z%a+Wn)l1jx8Chac@6CG4-W!U-FAfv-A@9v~2ZSOdJ%c-7gm^{)v z(&PG=agae_aZP7YmhYIVMxX9g7Az*0Hu_CqRPdPOklL}!8uqs+x@me&LDLDw7_j(D z0%6-BUp+;Yf*u)Cipi)&I>T3!vU)tU1^q|% z3hs&byebI|@9BM!W#oGbSJ60_?pbLU)4u%o4nM5BE(d+i z^}WoXxkLTgDiG^Hcf=SSwp^t->rG|eH~PKPB@w0KkpCSc;5^W$sqfUy$XiJDL8WpB z$B}oo^6kwS6RhESIl{3;L6W64RDJxYgoDcC__Wf}x2AX+#Pb4*mzMLIjc?88>G7lh<|?wh88x(i^$xn#>6P=z4oV%W zd`mHwkJfU2x5EdMti|51H`P>C4X3oYJ!`i|CL6LnS?eqrz*}O0@ZD0eY-8|MNc`i+( zbttr4uFV(gkS05ASDoxm?cgpr%~F|S=9+Md552?_nq}FkmZ0@|kq4*sq+RVowoGmn zsE?zBi-dPH`mpVI<_mLvc8`vAeBvzD<4}6%Kn9)G+#pZ8ImYnY63(0g2ScrVaZX3YOmEzpBIq zZ;E4csAFy}u9mVm6xgLhIYPAI@#}Lkq9jlQ}IX3U75~%>HWJ(xebE} zXY+Er4x?#uy^7}FX;c0<(b9T8^zZ~Vit`wXWZ$NI#Nm@*wXeS35xdSQ6cAhX({jqn zP_7E9G9Ct3IT&*(lKB%wuRNeNuDk zORC#=)U^3S*Kvxj0^^5eI;uSPUtWfNzo#|iA3QlW`BUl*QFizXh2fy~&sZgHp_w&# zp3Ym!s|UWRT4xPAr(fC9gXm7XW%N`uev)v!rySxa;TRMg;`|vB*@_1#hT6&=5}9)T~tr@ zJ{F=n+bdoCUQVASbiDc%>=TY_o%X?v3uEqE3TL`)lHc0p z3128(3EK*-?pCPay5ZeU*%3&z3uL10QT&*sb9n%s*5xOih2_WHY%o`LJk|Q&0d)*xA^Hydy24*$x&w6a z&q`0`RWfmgJ$Q0A)}w4!94IXRd$y?=ARac*~)vantxM{;npIuUZKuhO-YjLi|zN7T1 zD`S)6c?D~xH+-W7D7wh za&*}qF)r3Cqv@F5-etyN(2uv5+$4u2Rig7Sw+ybQhvajazwpQx^8aZzS&D z^C{Q**?Mc)mzgd-QUR-i%Xh-(ApW&RNpBt+S9k>BSW?7d&{PH0(yVOQ2od<{;8uYv z)%(^yGC{`4V<&WF!dj&F%{bflEvvVe8*IfUGKVL}hnsz2%U=hLEg$mcYd>r)P%Ah~ zd*HfdXQ;w|1XWbNn!d8-x5;Md^+Y`1;fm$E;mRp|a^C%Ntm;h`vBOx6k%*B*svy} z;*oRETg=<)D{T1;M^Em&)Y7N86KXX2q=8?uV`)ua%W6yWv!B{F7uHQk(cy;D*d#Ch ze6!*^Zi)R8!iX5Df@{9V*kQxB zm0eU%2=ND(9hJhnfY{Q}HO*Zs)2Ovg&h^#ygV9#acX_^aQ@UrEU?a}*?$QdhuW!R| z-_L5)nvv*TZo~xH&u^3$mJc;v!~I;qt=2D<5gl{JCA-FoBp%jkM{C{Bg1_8*3prQk z_pNG_aFC{Y(dQaYHfOV5CaqBvjqJUaxa!lGI0YYVG3$L^9;fY_YVxydXJ~8YU^7wM z_vaf>^G(I>t?C1jJrTyKo!Fgk&39)IA`_wIXVC8PQ-UOK*qfl$ITZ%cvz#?xWbIylo&SS zs~rvRaCbg>A*{vlTes=n~0c&j88q0_oy@-^53~ z95&f*cnID8T4s@M5wg};)A@FbNli*+$~#7Cv8jKnCv>sSAru$7bK!z?7TUq|Thu14 z*mqjBn3yPHD5kgbbC+)UM(Z|ZIOUIv-iY$c)0ecRnqLNVvp(jAOYY+m*b-S=JHsaB8mz#n3sbNU__ zkQ)iRvxGD&ZZI$22^4v~z+zg)=5;xnuW3HPqpv^OQ_c2H_>jDVj8D^G593!^hSdId zHWN-0_K5cmZnat_?I^nj%l`KR(fpZDzMTT!ms@X`R_*T1tI}*TFj$#e(9mwMS{;8J ze`u@>X;S}SB0Azn=W9~C-*a-$ea3|5jKT2ig-{5r~Gbi(dR#{m-fyP2=0){w}1gUWA z`j0nv>r~Tjah_<8%+So^|NQV4m$LSaTDl|7BsCc7zYtPns)@`(iK0Z&e=t&Fe=<_~ zUM>U(#@WeLi9oU-+Pb(p19T$rsfBkWKosQ3m!O8NIf00GwRLvV!#j~cWV+Fs1QrDv zz(55BXHOGhq$mO`jDRA*Fa#6|MvI|w5H(l4gROG)`XVl#$u)T8YZI!Z{{u z(Vdr3A+;Y0NBTy@td(LfUc=h_3JLb4dgp)-H=KiW}j}dh?14 zit`rlxGv{>KhT?(AZ6}P3UPh1zb!F42Q#i-MHWC`zP$cWK?275PfF@CtEU=4JH@)Z&imu|8yGz z1CxXJdq3P5=}B z@B$1Z_L{9F$prk%Q}U;xvl}@Ve=z|#{C69Qcwn_UTLV#B13~@@8U)dHAvnofkk`G* zZ@M6cM#f+#HwTB`9?-vM@ju)*;I|@h0s-tKQW#|n1_~7wg+j&PP$&upyv1aGmBZ4_ zg78PbBG88hZeYx>aR63Cfq5v@?>D&**jG@192f#c0CKo8@P+}pewhMXR057b_?0B! zP#78tgP~vuI8qcQ3`O!mp?p{W61pdmUF)9)7;g+wBdU@P$NGC)5NF!=&I z{YM6f0KEM}CMpV~>hCfX?B6mdu>1aV91?~G0RQ*7NH`3@{6A!(rw%!CFRS>MRGXS7pKm|e6oUELIeI7s% zu(H&Yz$RcRm?#P(uZ%I2tJr$B1KKfUgJ{(EmS#j8r9O3q>1(g+0m5 z5ez|yD*)#pXpEvbToFhN9Ht