diff --git a/pdfmajor/converters/HTMLConverter.py b/pdfmajor/converters/HTMLConverter.py index f96bb43..4c3faba 100644 --- a/pdfmajor/converters/HTMLConverter.py +++ b/pdfmajor/converters/HTMLConverter.py @@ -42,8 +42,8 @@ class HTMLConverter(PDFConverter): self.__current_width = None self.write_header() - def write(self, text: str): - text = " "*self.__levels_deep + text + '\n' + def write(self, text: str, lineend: str = '\n', deep_space: str = ' '): + text = deep_space*self.__levels_deep + text + lineend self.write_raw(text) def write_raw(self, text): @@ -78,7 +78,13 @@ class HTMLConverter(PDFConverter): self.__levels_deep -= 1 @contextmanager - def place_elm_with_child(self, tag_name: str, attr_dict: Dict[str, str] = {}, css: Dict[str, str] = None): + def place_elm_with_child(self, tag_name: str, attr_dict: Dict[str, str] = {}, css: Dict[str, str] = None, no_additional_char = False): + lineend = '\n' + deep_space = ' ' + if no_additional_char: + lineend = '' + deep_space = '' + if css is not None: attr_dict['style'] = ";".join([ f'{name}: {value}' @@ -88,11 +94,11 @@ class HTMLConverter(PDFConverter): f'{name}="{value}"' for name, value in attr_dict.items() ]) - self.write(f"<{tag_name} {attrs}>") + self.write(f"<{tag_name} {attrs}>", lineend=lineend) self.__levels_deep += 1 yield self.__levels_deep -= 1 - self.write(f"") + self.write(f"", deep_space=deep_space) def place_elm_close(self, tag_name: str, attr_dict: Dict[str, str] = {}, css: Dict[str, str] = None, as_childless = True): if css is not None: @@ -201,28 +207,39 @@ class HTMLConverter(PDFConverter): self.place_image(item) elif isinstance(item, LTChar): with self.place_elm_with_child('span', { 'class': 'char' }, { - 'font-size': f'{item.size}px', - 'font-family': item.fontname, - 'font-weight': 'bold' if 'bold' in item.fontname.lower() else '', - 'color': get_color(item.graphicstate.ncolor), - 'position': 'absolute', - 'left': f'{item.x0}', - 'bottom': f'{item.y0}', - 'transform': f'skew({item.font.italic_angle}deg, 0deg)' + 'width': item.width, + 'min-width': item.width, + 'max-width': item.width, + 'height': item.height, + 'min-height': item.height, + 'max-height': item.height, }): self.write(item.get_text()) elif isinstance(item, LTCharBlock): with self.place_elm_with_child('span', { 'class': 'char-block' }, { - 'font-size': f'{item.size}px', - 'font-family': item.fontname, - 'font-weight': 'bold' if 'bold' in item.fontname.lower() else '', - 'color': get_color(item.graphicstate.ncolor), - 'position': 'absolute', - 'left': f'{item.x0}', - 'bottom': f'{item.y0}', - 'transform': f'skew({item.font.italic_angle}deg, 0deg)' - }): - self.write(item.get_text()) + 'position': 'absolute', + 'left': f'{item.x0}', + 'bottom': f'{item.y0}', + 'text-align': 'justify', + 'font-size': f'{item.size}px', + 'font-family': item.fontname, + 'font-weight': item.font.font_weight, + 'color': get_color(item.graphicstate.ncolor), + 'width': item.width, + 'min-width': item.width, + 'max-width': item.width, + 'height': item.height, + 'min-height': item.height, + 'max-height': item.height, + 'transform': f'skew({item.font.italic_angle}deg, 0deg)', + 'text-align': 'center', + 'display': 'flex', + 'flex-flow': 'row nowrap', + 'justify-content': 'space-between', + 'padding-left': item.font.leading + }): + for char in item: + render(char) render(ltpage) def close(self): diff --git a/pdfmajor/interpreter/PDFFont.py b/pdfmajor/interpreter/PDFFont.py index 1c2320c..adbe25b 100644 --- a/pdfmajor/interpreter/PDFFont.py +++ b/pdfmajor/interpreter/PDFFont.py @@ -531,6 +531,19 @@ class PDFFont(object): @abstractmethod def to_unichr(self, cid): raise NotImplementedError + + @property + def font_weight(self): + if 'FontWeight' in self.descriptor.keys(): + return self.descriptor['FontWeight'] + elif 'bold' in self.fontname.lower(): + return 'bold' + else: + return None + + @property + def is_bold(self): + return self.font_weight == 'bold' or self.font_weight > 549 # PDFSimpleFont diff --git a/pdfmajor/interpreter/PDFPageInterpreter.py b/pdfmajor/interpreter/PDFPageInterpreter.py index 481a091..e5eda40 100644 --- a/pdfmajor/interpreter/PDFPageInterpreter.py +++ b/pdfmajor/interpreter/PDFPageInterpreter.py @@ -26,7 +26,7 @@ from .PDFGraphicState import PDFGraphicState from .PDFTextState import PDFTextState from .PDFContentParser import PDFContentParser -from ..utils import settings, mult_matrix, MATRIX_IDENTITY +from ..utils import mult_matrix, MATRIX_IDENTITY from .constants import LITERAL_FORM, LITERAL_IMAGE from .types import CurvePoint, CurvePath @@ -303,8 +303,7 @@ class PDFPageInterpreter(object): try: self.scs = self.csmap[literal_name(name)] except KeyError: - if settings.STRICT: - raise PDFInterpreterError('Undefined ColorSpace: %r' % name) + raise PDFInterpreterError('Undefined ColorSpace: %r' % name) return # setcolorspace-non-strokine @@ -312,8 +311,7 @@ class PDFPageInterpreter(object): try: self.ncs = self.csmap[literal_name(name)] except KeyError: - if settings.STRICT: - raise PDFInterpreterError('Undefined ColorSpace: %r' % name) + raise PDFInterpreterError('Undefined ColorSpace: %r' % name) return # setgray-stroking @@ -357,9 +355,7 @@ class PDFPageInterpreter(object): if self.scs: n = self.scs.ncomponents else: - if settings.STRICT: - raise PDFInterpreterError('No colorspace specified!') - n = 1 + raise PDFInterpreterError('No colorspace specified!') self.pop(n) return @@ -367,9 +363,7 @@ class PDFPageInterpreter(object): if self.ncs: n = self.ncs.ncomponents else: - if settings.STRICT: - raise PDFInterpreterError('No colorspace specified!') - n = 1 + raise PDFInterpreterError('No colorspace specified!') self.pop(n) return @@ -432,6 +426,8 @@ class PDFPageInterpreter(object): def do_Tw(self, space): self.textstate.wordspace = space return + + # def do_Th(self, ) # textscale def do_Tz(self, scale): @@ -448,9 +444,8 @@ class PDFPageInterpreter(object): try: self.textstate.font = self.fontmap[literal_name(fontid)] except KeyError: - if settings.STRICT: - raise PDFInterpreterError('Undefined Font id: %r' % fontid) - self.textstate.font = self.rsrcmgr.get_font(None, {}) + raise PDFInterpreterError('Undefined Font id: %r' % fontid) + # self.textstate.font = self.rsrcmgr.get_font(None, {}) self.textstate.fontsize = fontsize return @@ -495,9 +490,7 @@ class PDFPageInterpreter(object): # show-pos def do_TJ(self, seq: bytearray): if self.textstate.font is None: - if settings.STRICT: - raise PDFInterpreterError('No font specified!') - return + raise PDFInterpreterError('No font specified!') self.device.render_string(self.textstate.copy(), seq, self.ncs, self.graphicstate.copy()) return @@ -540,9 +533,7 @@ class PDFPageInterpreter(object): try: xobj = PDFStream.validated_stream(self.xobjmap[xobjid]) except KeyError: - if settings.STRICT: - raise PDFInterpreterError('Undefined xobject id: %r' % xobjid) - return + raise PDFInterpreterError('Undefined xobject id: %r' % xobjid) log.info('Processing xobj: %r', xobj) subtype = xobj.get('Subtype') if subtype is LITERAL_FORM and 'BBox' in xobj: @@ -618,8 +609,7 @@ class PDFPageInterpreter(object): log.debug('exec: %s', name) func() else: - if settings.STRICT: - raise PDFInterpreterError('Unknown operator: %r' % name) + raise PDFInterpreterError('Unknown operator: %r' % name) else: self.push(obj) return diff --git a/pdfmajor/layouts/LTCharBlock.py b/pdfmajor/layouts/LTCharBlock.py index 1920cf9..05c9643 100644 --- a/pdfmajor/layouts/LTCharBlock.py +++ b/pdfmajor/layouts/LTCharBlock.py @@ -60,6 +60,9 @@ class LTCharBlock(LTComponent): def __repr__(self): return f"""<{self.__class__.__name__} font="{self.fontname}" text="{self.get_text()}"/>""" + def __iter__(self): + return iter(self.chars) + def get_text(self): return "".join([ c.get_text() for c in self.chars ])