Recover input filename from symlink on error message

The recent commit to accept files from stdin broken the feature of returning the input filename on an error, returning the temp filename instead, which is confusing.
Merge branch 'develop'
2016-08-23 17:38:28 -07:00 · 2016-08-23 16:03:07 -07:00 · 2016-08-23 15:59:34 -07:00 · 2016-08-19 10:14:33 -07:00 · 2016-08-09 22:40:29 -07:00 · 2016-08-09 15:46:24 -07:00
6 changed files with 346 additions and 231 deletions
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2015, The OCRmyPDF Authors
+Copyright (c) 2013-2016, The OCRmyPDF Authors

 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
@@ -20,7 +20,7 @@ from PIL import Image
 from functools import partial

 from ruffus import transform, suffix, merge, active_if, regex, jobs_limit, \
-    formatter, follows, split, collate, check_if_uptodate
+    formatter, follows, split, collate, check_if_uptodate, graphviz
 import ruffus.ruffus_exceptions as ruffus_exceptions
 import ruffus.cmdline as cmdline
 import ruffus.proxy_logger as proxy_logger
@@ -366,14 +366,16 @@ def re_symlink(input_file, soft_link_name, log=_log):
    if os.path.lexists(soft_link_name):
        # do not delete or overwrite real (non-soft link) file
        if not os.path.islink(soft_link_name):
-            raise Exception("%s exists and is not a link" % soft_link_name)
+            raise FileExistsError(
+                "%s exists and is not a link" % soft_link_name)
        try:
            os.unlink(soft_link_name)
        except:
            log.debug("Can't unlink %s" % (soft_link_name))

    if not os.path.exists(input_file):
-        raise Exception("trying to create a broken symlink to %s" % input_file)
+        raise FileNotFoundError(
+            "trying to create a broken symlink to %s" % input_file)

    log.debug("os.symlink(%s, %s)" % (input_file, soft_link_name))

@@ -409,7 +411,16 @@ def triage_image_file(input_file, output_file, log):
        log.info("Input file is not a PDF, checking if it is an image...")
        im = Image.open(input_file)
    except EnvironmentError as e:
-        log.error(e)
+        msg = str(e)
+
+        # Recover the original filename
+        realpath = ''
+        if os.path.islink(input_file):
+            realpath = os.path.realpath(input_file)
+        elif os.path.isfile(input_file):
+            realpath = '<stdin>'
+        msg = msg.replace(input_file, realpath)
+        log.error(msg)
        sys.exit(ExitCode.input_file)
        return
    else:
@@ -459,9 +470,9 @@ def triage_image_file(input_file, output_file, log):


@transform(
-    input=options.input_file,
+    input=os.path.join(work_folder, 'origin'),
    filter=formatter('(?i)'),
-    output=os.path.join(work_folder, '{basename[0]}.pdf'),
+    output=os.path.join(work_folder, 'origin.pdf'),
    extras=[_log])
 def triage(
        input_file,
@@ -798,6 +809,7 @@ def preprocess_clean(
    filter=suffix(".pp-clean.png"),
    output=".hocr",
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#00cc66"')
 def ocr_tesseract_hocr(
        input_file,
        output_file,
@@ -823,6 +835,7 @@ def ocr_tesseract_hocr(
    filter=regex(r".*/(\d{6})(?:\.page|\.pp-deskew|\.pp-clean)\.png"),
    output=os.path.join(work_folder, r'\1.image'),
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(shape='diamond')
 def select_image_for_pdf(
        infiles,
        output_file,
@@ -863,6 +876,7 @@ def select_image_for_pdf(
    filter=regex(r".*/(\d{6})(?:\.image|\.ocr\.oriented\.pdf)"),
    output=os.path.join(work_folder, r'\1.image-layer.pdf'),
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#00cc66"', shape='diamond')
 def select_image_layer(
        infiles,
        output_file,
@@ -897,6 +911,7 @@ def select_image_layer(
    filter=suffix('.hocr'),
    output='.hocr.pdf',
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#00cc66"')
 def render_hocr_page(
        input_file,
        output_file,
@@ -919,6 +934,7 @@ def render_hocr_page(
    filter=regex(r".*/(\d{6})(?:\.image|\.hocr)"),
    output=os.path.join(work_folder, r'\1.debug.pdf'),
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#00cc66"')
 def render_hocr_debug_page(
        infiles,
        output_file,
@@ -946,6 +962,7 @@ class PdfMergeFailedError(Exception):
    filter=regex(r".*/(\d{6})(?:\.hocr\.pdf|\.image-layer\.pdf)"),
    output=os.path.join(work_folder, r'\1.rendered.pdf'),
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#00cc66"')
 def add_text_layer(
        infiles,
        output_file,
@@ -1018,6 +1035,7 @@ def add_text_layer(
    filter=regex(r".*/(\d{6})(?:\.image|\.ocr\.oriented\.pdf)"),
    output=os.path.join(work_folder, r'\1.rendered.pdf'),
    extras=[_log, _pdfinfo, _pdfinfo_lock])
+@graphviz(fillcolor='"#66ccff"')
 def tesseract_ocr_and_render_pdf(
        input_files,
        output_file,
@@ -1298,11 +1316,30 @@ def traverse_ruffus_exception(e_args):


 def run_pipeline():
+    # Any changes to options will not take effect for options that are already
+    # bound to function parameters in the pipeline. (For example
+    # options.input_file, options.pdf_renderer are already bound.)
+    global options
    if not options.jobs:
        options.jobs = available_cpu_count()
    try:
        options.history_file = os.path.join(
            work_folder, 'ruffus_history.sqlite')
+        start_input_file = os.path.join(
+            work_folder, 'origin')
+
+        if options.input_file == '-':
+            # stdin
+            with open(start_input_file, 'wb') as stream_buffer:
+                from shutil import copyfileobj
+                copyfileobj(sys.stdin.buffer, stream_buffer)
+        else:
+            try:
+                re_symlink(options.input_file, start_input_file, _log)
+            except FileNotFoundError:
+                _log.error("File not found - " + options.input_file)
+                return ExitCode.input_file
+
        cmdline.run(options)
    except ruffus_exceptions.RethrownJobError as e:
        if options.verbose:
@@ -214,6 +214,17 @@ def _find_page_regular_images(page, pageinfo, contentsinfo):
        image['width'] = pdfimage['/Width']
        image['height'] = pdfimage['/Height']
        image['bpc'] = pdfimage['/BitsPerComponent']
+
+        # Fixme: this is incorrectly treats explicit masks as stencil masks,
+        # but good enough for now. Explicit masks have /ImageMask true but are
+        # never called for in content stream, instead are drawn as a /Mask on
+        # other images. For our purposes finding out the details of /Mask
+        # will seldom matter.
+        if '/ImageMask' in pdfimage:
+            image['type'] = 'stencil' if pdfimage['/ImageMask'].value \
+                            else 'image'
+        else:
+            image['type'] = 'image'
        if '/Filter' in pdfimage:
            filter_ = pdfimage['/Filter']
            if isinstance(filter_, pypdf.generic.ArrayObject):
@@ -246,6 +257,20 @@ def _find_page_regular_images(page, pageinfo, contentsinfo):
                continue
            shorthand = raster[1]

+            if image['type'] == 'stencil':
+                # Stencil masks are implicitly scaled over the whole page
+                # Images that are used in explicit masks are not drawn directly
+                # but drawn by the image they mask over, so they will never
+                # be called for in raster settings
+                if shorthand != (1, 0, 0, 1, 0, 0):
+                    raise NotImplementedError(
+                        "Don't know how to handle "
+                        "stencil masks when graphics stack depth > 0.")
+                page_w = float(pageinfo['width_inches']) * 72.0
+                page_h = float(pageinfo['height_inches']) * 72.0
+                shorthand = (page_w, 0.0, 0.0,
+                             page_h, 0.0, 0.0)
+
            dpi_w, dpi_h = _get_dpi(
                shorthand, (image['width'], image['height']))

@@ -4,294 +4,335 @@
 <!-- Generated by graphviz version 2.38.0 (20140413.2041)
 -->
 <!-- Title: Pipeline: Pages: 1 -->
-<svg width="1452pt" height="824pt"
- viewBox="0.00 0.00 1452.00 824.08" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 820.083)">
+<svg width="1444pt" height="973pt"
+ viewBox="0.00 0.00 1444.00 973.18" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 969.181)">
 <title>Pipeline:</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-820.083 1448,-820.083 1448,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-969.181 1440,-969.181 1440,4 -4,4"/>
 <g id="clust1" class="cluster"><title>clustertasks</title>
-<polygon fill="none" stroke="black" points="8,-8 8,-808.083 1436,-808.083 1436,-8 8,-8"/>
-<text text-anchor="middle" x="722" y="-780.083" font-family="Times,serif" font-size="30.00" fill="#ff3232">Pipeline:</text>
+<polygon fill="none" stroke="black" points="8,-8 8,-957.181 1428,-957.181 1428,-8 8,-8"/>
+<text text-anchor="middle" x="718" y="-929.181" font-family="Times,serif" font-size="30.00" fill="#ff3232">Pipeline:</text>
 </g>
 <!-- t0 -->
 <g id="node1" class="node"><title>t0</title>
-<polygon fill="#efa03b" stroke="black" points="1256.54,-762.083 1033.46,-762.083 1029.46,-758.083 1029.46,-726.083 1252.54,-726.083 1256.54,-730.083 1256.54,-762.083"/>
-<polyline fill="none" stroke="black" points="1252.54,-758.083 1029.46,-758.083 "/>
-<polyline fill="none" stroke="black" points="1252.54,-758.083 1252.54,-726.083 "/>
-<polyline fill="none" stroke="black" points="1252.54,-758.083 1256.54,-762.083 "/>
-<text text-anchor="middle" x="1143" y="-738.083" font-family="Times,serif" font-size="20.00">repair_pdf</text>
+<polygon fill="#efa03b" stroke="black" points="1219.77,-911.181 1034.23,-911.181 1030.23,-907.181 1030.23,-875.181 1215.77,-875.181 1219.77,-879.181 1219.77,-911.181"/>
+<polyline fill="none" stroke="black" points="1215.77,-907.181 1030.23,-907.181 "/>
+<polyline fill="none" stroke="black" points="1215.77,-907.181 1215.77,-875.181 "/>
+<polyline fill="none" stroke="black" points="1215.77,-907.181 1219.77,-911.181 "/>
+<text text-anchor="middle" x="1125" y="-887.181" font-family="Times,serif" font-size="20.00">triage</text>
 </g>
 <!-- t1 -->
 <g id="node2" class="node"><title>t1</title>
-<polygon fill="#efa03b" stroke="black" points="1234.11,-683.155 1030,-700.057 825.888,-683.155 826.078,-655.806 1233.92,-655.806 1234.11,-683.155"/>
-<polygon fill="none" stroke="black" points="1238.13,-686.834 1030,-704.069 821.866,-686.834 822.11,-651.808 1237.89,-651.808 1238.13,-686.834"/>
-<text text-anchor="middle" x="1030" y="-669.596" font-family="Times,serif" font-size="20.00">split_pages</text>
+<polygon fill="#efa03b" stroke="black" points="1238.54,-853.181 1015.46,-853.181 1011.46,-849.181 1011.46,-817.181 1234.54,-817.181 1238.54,-821.181 1238.54,-853.181"/>
+<polyline fill="none" stroke="black" points="1234.54,-849.181 1011.46,-849.181 "/>
+<polyline fill="none" stroke="black" points="1234.54,-849.181 1234.54,-817.181 "/>
+<polyline fill="none" stroke="black" points="1234.54,-849.181 1238.54,-853.181 "/>
+<text text-anchor="middle" x="1125" y="-829.181" font-family="Times,serif" font-size="20.00">repair_pdf</text>
 </g>
 <!-- t0&#45;&gt;t1 -->
 <g id="edge1" class="edge"><title>t0&#45;&gt;t1</title>
-<path fill="none" stroke="#0044a0" d="M1113.9,-725.961C1103.58,-719.89 1091.66,-712.873 1080.09,-706.069"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1081.75,-702.982 1071.35,-700.927 1078.2,-709.015 1081.75,-702.982"/>
-</g>
-<!-- t14 -->
-<g id="node16" class="node"><title>t14</title>
-<polygon fill="#efa03b" stroke="black" points="1428.08,-625.109 1089.92,-625.109 1085.92,-621.109 1085.92,-589.109 1424.08,-589.109 1428.08,-593.109 1428.08,-625.109"/>
-<polyline fill="none" stroke="black" points="1424.08,-621.109 1085.92,-621.109 "/>
-<polyline fill="none" stroke="black" points="1424.08,-621.109 1424.08,-589.109 "/>
-<polyline fill="none" stroke="black" points="1424.08,-621.109 1428.08,-625.109 "/>
-<text text-anchor="middle" x="1257" y="-601.109" font-family="Times,serif" font-size="20.00">generate_postscript_stub</text>
-</g>
-<!-- t0&#45;&gt;t14 -->
-<g id="edge22" class="edge"><title>t0&#45;&gt;t14</title>
-<path fill="none" stroke="#0044a0" d="M1219.32,-726.004C1229.98,-720.592 1239.75,-713.466 1247,-704.083 1261.92,-684.78 1263.1,-656.385 1261.35,-635.486"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1264.8,-634.881 1260.22,-625.328 1257.84,-635.653 1264.8,-634.881"/>
+<path fill="none" stroke="#0044a0" d="M1125,-875.075C1125,-871.384 1125,-867.394 1125,-863.424"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1128.5,-863.182 1125,-853.182 1121.5,-863.182 1128.5,-863.182"/>
 </g>
 <!-- t2 -->
 <g id="node3" class="node"><title>t2</title>
-<polygon fill="#efa03b" stroke="black" points="1029.88,-625.109 748.117,-625.109 744.117,-621.109 744.117,-589.109 1025.88,-589.109 1029.88,-593.109 1029.88,-625.109"/>
-<polyline fill="none" stroke="black" points="1025.88,-621.109 744.117,-621.109 "/>
-<polyline fill="none" stroke="black" points="1025.88,-621.109 1025.88,-589.109 "/>
-<polyline fill="none" stroke="black" points="1025.88,-621.109 1029.88,-625.109 "/>
-<text text-anchor="middle" x="887" y="-601.109" font-family="Times,serif" font-size="20.00">rasterize_preview</text>
+<polygon fill="#efa03b" stroke="black" points="1329.11,-774.253 1125,-791.156 920.888,-774.253 921.078,-746.905 1328.92,-746.905 1329.11,-774.253"/>
+<polygon fill="none" stroke="black" points="1333.13,-777.932 1125,-795.167 916.866,-777.932 917.11,-742.906 1332.89,-742.906 1333.13,-777.932"/>
+<text text-anchor="middle" x="1125" y="-760.694" font-family="Times,serif" font-size="20.00">split_pages</text>
 </g>
 <!-- t1&#45;&gt;t2 -->
 <g id="edge2" class="edge"><title>t1&#45;&gt;t2</title>
-<path fill="none" stroke="#0044a0" d="M980.788,-651.715C965.266,-644.498 948.187,-636.558 932.905,-629.452"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="934.195,-626.193 923.652,-625.15 931.244,-632.54 934.195,-626.193"/>
+<path fill="none" stroke="#0044a0" d="M1125,-817.059C1125,-813.44 1125,-809.484 1125,-805.438"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1128.5,-805.334 1125,-795.334 1121.5,-805.334 1128.5,-805.334"/>
+</g>
+<!-- t15 -->
+<g id="node17" class="node"><title>t15</title>
+<polygon fill="#efa03b" stroke="black" points="632.082,-716.208 293.918,-716.208 289.918,-712.208 289.918,-680.208 628.082,-680.208 632.082,-684.208 632.082,-716.208"/>
+<polyline fill="none" stroke="black" points="628.082,-712.208 289.918,-712.208 "/>
+<polyline fill="none" stroke="black" points="628.082,-712.208 628.082,-680.208 "/>
+<polyline fill="none" stroke="black" points="628.082,-712.208 632.082,-716.208 "/>
+<text text-anchor="middle" x="461" y="-692.208" font-family="Times,serif" font-size="20.00">generate_postscript_stub</text>
+</g>
+<!-- t1&#45;&gt;t15 -->
+<g id="edge23" class="edge"><title>t1&#45;&gt;t15</title>
+<path fill="none" stroke="#0044a0" d="M1026.3,-817.165C989.157,-810.572 946.587,-802.788 908,-795.181 781.899,-770.319 636.479,-738.51 546.633,-718.49"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="547.289,-715.05 536.767,-716.289 545.765,-721.882 547.289,-715.05"/>
+</g>
+<!-- t18 -->
+<g id="node19" class="node"><title>t18</title>
+<polygon fill="#efa03b" stroke="black" points="1025.79,-156.452 1221,-129.134 1416.21,-156.452 1416.03,-200.654 1025.97,-200.654 1025.79,-156.452"/>
+<polygon fill="none" stroke="black" points="1021.78,-152.971 1221,-125.091 1420.22,-152.971 1420.01,-204.657 1021.99,-204.657 1021.78,-152.971"/>
+<text text-anchor="middle" x="1221" y="-162.669" font-family="Times,serif" font-size="20.00">merge_pages_qpdf</text>
+</g>
+<!-- t1&#45;&gt;t18 -->
+<g id="edge33" class="edge"><title>t1&#45;&gt;t18</title>
+<path fill="none" stroke="#0044a0" d="M1238.67,-826.639C1321.4,-814.236 1419,-782.049 1419,-699.208 1419,-699.208 1419,-699.208 1419,-319.208 1419,-280.294 1424,-263.161 1398,-234.208 1389.64,-224.894 1379.82,-216.923 1369.17,-210.101"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1370.83,-207.019 1360.46,-204.872 1367.23,-213.02 1370.83,-207.019"/>
 </g>
 <!-- t3 -->
 <g id="node4" class="node"><title>t3</title>
-<polygon fill="#efa03b" stroke="black" points="1128.15,-567.109 893.852,-567.109 889.852,-563.109 889.852,-531.109 1124.15,-531.109 1128.15,-535.109 1128.15,-567.109"/>
-<polyline fill="none" stroke="black" points="1124.15,-563.109 889.852,-563.109 "/>
-<polyline fill="none" stroke="black" points="1124.15,-563.109 1124.15,-531.109 "/>
-<polyline fill="none" stroke="black" points="1124.15,-563.109 1128.15,-567.109 "/>
-<text text-anchor="middle" x="1009" y="-543.109" font-family="Times,serif" font-size="20.00">orient_page</text>
-</g>
-<!-- t1&#45;&gt;t3 -->
-<g id="edge4" class="edge"><title>t1&#45;&gt;t3</title>
-<path fill="none" stroke="#0044a0" d="M1037.63,-651.508C1042.21,-633.96 1045.92,-609.455 1039,-589.109 1037.4,-584.404 1034.98,-579.822 1032.19,-575.552"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1034.85,-573.258 1026.1,-567.282 1029.21,-577.409 1034.85,-573.258"/>
+<polygon fill="#efa03b" stroke="black" points="1186.88,-716.208 905.117,-716.208 901.117,-712.208 901.117,-680.208 1182.88,-680.208 1186.88,-684.208 1186.88,-716.208"/>
+<polyline fill="none" stroke="black" points="1182.88,-712.208 901.117,-712.208 "/>
+<polyline fill="none" stroke="black" points="1182.88,-712.208 1182.88,-680.208 "/>
+<polyline fill="none" stroke="black" points="1182.88,-712.208 1186.88,-716.208 "/>
+<text text-anchor="middle" x="1044" y="-692.208" font-family="Times,serif" font-size="20.00">rasterize_preview</text>
 </g>
 <!-- t2&#45;&gt;t3 -->
 <g id="edge3" class="edge"><title>t2&#45;&gt;t3</title>
-<path fill="none" stroke="#0044a0" d="M924.267,-589.003C936.328,-583.467 949.857,-577.257 962.502,-571.453"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="964.333,-574.463 971.961,-567.111 961.413,-568.102 964.333,-574.463"/>
+<path fill="none" stroke="#0044a0" d="M1097.12,-742.813C1089.24,-736.345 1080.66,-729.296 1072.73,-722.788"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1074.71,-719.888 1064.76,-716.249 1070.27,-725.299 1074.71,-719.888"/>
 </g>
 <!-- t4 -->
 <g id="node5" class="node"><title>t4</title>
-<polygon fill="#efa03b" stroke="black" points="1027.3,-509.109 676.701,-509.109 672.701,-505.109 672.701,-473.109 1023.3,-473.109 1027.3,-477.109 1027.3,-509.109"/>
-<polyline fill="none" stroke="black" points="1023.3,-505.109 672.701,-505.109 "/>
-<polyline fill="none" stroke="black" points="1023.3,-505.109 1023.3,-473.109 "/>
-<polyline fill="none" stroke="black" points="1023.3,-505.109 1027.3,-509.109 "/>
-<text text-anchor="middle" x="850" y="-485.109" font-family="Times,serif" font-size="20.00">rasterize_with_ghostscript</text>
+<polygon fill="#efa03b" stroke="black" points="1258.15,-658.208 1023.85,-658.208 1019.85,-654.208 1019.85,-622.208 1254.15,-622.208 1258.15,-626.208 1258.15,-658.208"/>
+<polyline fill="none" stroke="black" points="1254.15,-654.208 1019.85,-654.208 "/>
+<polyline fill="none" stroke="black" points="1254.15,-654.208 1254.15,-622.208 "/>
+<polyline fill="none" stroke="black" points="1254.15,-654.208 1258.15,-658.208 "/>
+<text text-anchor="middle" x="1139" y="-634.208" font-family="Times,serif" font-size="20.00">orient_page</text>
+</g>
+<!-- t2&#45;&gt;t4 -->
+<g id="edge5" class="edge"><title>t2&#45;&gt;t4</title>
+<path fill="none" stroke="#0044a0" d="M1171.65,-742.795C1181.42,-735.692 1190.44,-726.864 1196,-716.208 1203.4,-702.023 1203.46,-694.36 1196,-680.208 1192.84,-674.222 1188.31,-668.98 1183.15,-664.445"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1185.3,-661.676 1175.25,-658.302 1181,-667.203 1185.3,-661.676"/>
 </g>
 <!-- t3&#45;&gt;t4 -->
-<g id="edge5" class="edge"><title>t3&#45;&gt;t4</title>
-<path fill="none" stroke="#0044a0" d="M960.431,-531.003C943.787,-525.141 924.999,-518.524 907.704,-512.433"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="908.867,-509.132 898.272,-509.111 906.541,-515.734 908.867,-509.132"/>
-</g>
-<!-- t9 -->
-<g id="node11" class="node"><title>t9</title>
-<polygon fill="#efa03b" stroke="black" points="314.109,-277.109 19.8906,-277.109 15.8906,-273.109 15.8906,-241.109 310.109,-241.109 314.109,-245.109 314.109,-277.109"/>
-<polyline fill="none" stroke="black" points="310.109,-273.109 15.8906,-273.109 "/>
-<polyline fill="none" stroke="black" points="310.109,-273.109 310.109,-241.109 "/>
-<polyline fill="none" stroke="black" points="310.109,-273.109 314.109,-277.109 "/>
-<text text-anchor="middle" x="165" y="-253.109" font-family="Times,serif" font-size="20.00">select_image_layer</text>
-</g>
-<!-- t3&#45;&gt;t9 -->
-<g id="edge14" class="edge"><title>t3&#45;&gt;t9</title>
-<path fill="none" stroke="#0044a0" d="M889.675,-542.297C675.505,-530.255 248,-498.192 248,-434.109 248,-434.109 248,-434.109 248,-374.109 248,-337.597 219.83,-304.936 196.312,-284.031"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="198.437,-281.243 188.562,-277.404 193.888,-286.563 198.437,-281.243"/>
-</g>
-<!-- t15 -->
-<g id="node14" class="node"><title>t15</title>
-<polygon fill="#efa03b" stroke="black" points="1391.34,-451.109 1170.66,-451.109 1166.66,-447.109 1166.66,-415.109 1387.34,-415.109 1391.34,-419.109 1391.34,-451.109"/>
-<polyline fill="none" stroke="black" points="1387.34,-447.109 1166.66,-447.109 "/>
-<polyline fill="none" stroke="black" points="1387.34,-447.109 1387.34,-415.109 "/>
-<polyline fill="none" stroke="black" points="1387.34,-447.109 1391.34,-451.109 "/>
-<text text-anchor="middle" x="1279" y="-427.109" font-family="Times,serif" font-size="20.00">skip_page</text>
-</g>
-<!-- t3&#45;&gt;t15 -->
-<g id="edge19" class="edge"><title>t3&#45;&gt;t15</title>
-<path fill="none" stroke="#0044a0" d="M1060.32,-531.078C1078.95,-524.591 1100.07,-516.881 1119,-509.109 1159.3,-492.568 1204.11,-471.304 1236.04,-455.645"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1237.67,-458.74 1245.1,-451.181 1234.58,-452.461 1237.67,-458.74"/>
-</g>
-<!-- t13 -->
-<g id="node15" class="node"><title>t13</title>
-<polygon fill="#efa03b" stroke="black" points="1388.24,-277.109 1007.76,-277.109 1003.76,-273.109 1003.76,-241.109 1384.24,-241.109 1388.24,-245.109 1388.24,-277.109"/>
-<polyline fill="none" stroke="black" points="1384.24,-273.109 1003.76,-273.109 "/>
-<polyline fill="none" stroke="black" points="1384.24,-273.109 1384.24,-241.109 "/>
-<polyline fill="none" stroke="black" points="1384.24,-273.109 1388.24,-277.109 "/>
-<text text-anchor="middle" x="1196" y="-253.109" font-family="Times,serif" font-size="20.00">tesseract_ocr_and_render_pdf</text>
-</g>
-<!-- t3&#45;&gt;t13 -->
-<g id="edge21" class="edge"><title>t3&#45;&gt;t13</title>
-<path fill="none" stroke="#0044a0" d="M1040.79,-531.094C1071.69,-511.983 1114,-477.834 1114,-434.109 1114,-434.109 1114,-434.109 1114,-374.109 1114,-337.749 1141.83,-305.063 1165.07,-284.11"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1167.46,-286.664 1172.72,-277.466 1162.87,-281.377 1167.46,-286.664"/>
+<g id="edge4" class="edge"><title>t3&#45;&gt;t4</title>
+<path fill="none" stroke="#0044a0" d="M1073.02,-680.102C1081.95,-674.836 1091.92,-668.963 1101.34,-663.407"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1103.32,-666.302 1110.16,-658.209 1099.77,-660.272 1103.32,-666.302"/>
 </g>
 <!-- t5 -->
 <g id="node6" class="node"><title>t5</title>
-<polygon fill="#efa03b" stroke="black" points="830.742,-451.109 535.258,-451.109 531.258,-447.109 531.258,-415.109 826.742,-415.109 830.742,-419.109 830.742,-451.109"/>
-<polyline fill="none" stroke="black" points="826.742,-447.109 531.258,-447.109 "/>
-<polyline fill="none" stroke="black" points="826.742,-447.109 826.742,-415.109 "/>
-<polyline fill="none" stroke="black" points="826.742,-447.109 830.742,-451.109 "/>
-<text text-anchor="middle" x="681" y="-427.109" font-family="Times,serif" font-size="20.00">preprocess_deskew</text>
+<polygon fill="#efa03b" stroke="black" points="1271.3,-600.208 920.701,-600.208 916.701,-596.208 916.701,-564.208 1267.3,-564.208 1271.3,-568.208 1271.3,-600.208"/>
+<polyline fill="none" stroke="black" points="1267.3,-596.208 916.701,-596.208 "/>
+<polyline fill="none" stroke="black" points="1267.3,-596.208 1267.3,-564.208 "/>
+<polyline fill="none" stroke="black" points="1267.3,-596.208 1271.3,-600.208 "/>
+<text text-anchor="middle" x="1094" y="-576.208" font-family="Times,serif" font-size="20.00">rasterize_with_ghostscript</text>
 </g>
 <!-- t4&#45;&gt;t5 -->
 <g id="edge6" class="edge"><title>t4&#45;&gt;t5</title>
-<path fill="none" stroke="#0044a0" d="M798.376,-473.003C780.521,-467.087 760.346,-460.402 741.823,-454.264"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="742.901,-450.934 732.308,-451.111 740.699,-457.579 742.901,-450.934"/>
+<path fill="none" stroke="#0044a0" d="M1125.25,-622.102C1121.76,-617.759 1117.94,-613.003 1114.21,-608.353"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1116.65,-605.812 1107.66,-600.209 1111.2,-610.197 1116.65,-605.812"/>
 </g>
-<!-- t8 -->
-<g id="node10" class="node"><title>t8</title>
-<polygon fill="#efa03b" stroke="black" points="980.119,-335.109 665.881,-335.109 661.881,-331.109 661.881,-299.109 976.119,-299.109 980.119,-303.109 980.119,-335.109"/>
-<polyline fill="none" stroke="black" points="976.119,-331.109 661.881,-331.109 "/>
-<polyline fill="none" stroke="black" points="976.119,-331.109 976.119,-299.109 "/>
-<polyline fill="none" stroke="black" points="976.119,-331.109 980.119,-335.109 "/>
-<text text-anchor="middle" x="821" y="-311.109" font-family="Times,serif" font-size="20.00">select_image_for_pdf</text>
+<!-- t10 -->
+<g id="node12" class="node"><title>t10</title>
+<polygon fill="#00cc66" stroke="black" points="334,-348.208 35.7812,-320.208 334,-292.208 632.219,-320.208 334,-348.208"/>
+<text text-anchor="middle" x="334" y="-314.208" font-family="Times,serif" font-size="20.00">select_image_layer</text>
 </g>
-<!-- t4&#45;&gt;t8 -->
-<g id="edge12" class="edge"><title>t4&#45;&gt;t8</title>
-<path fill="none" stroke="#0044a0" d="M848.03,-473.087C846.196,-457.857 843.261,-434.941 840,-415.109 836.1,-391.393 830.78,-364.592 826.761,-345.181"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="830.152,-344.296 824.68,-335.224 823.3,-345.728 830.152,-344.296"/>
+<!-- t4&#45;&gt;t10 -->
+<g id="edge15" class="edge"><title>t4&#45;&gt;t10</title>
+<path fill="none" stroke="#0044a0" d="M1019.87,-634.085C799.18,-622.991 349,-592.156 349,-525.208 349,-525.208 349,-525.208 349,-465.208 349,-428.606 344.147,-387.052 339.961,-358.022"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="343.393,-357.303 338.46,-347.926 336.469,-358.332 343.393,-357.303"/>
+</g>
+<!-- t16 -->
+<g id="node15" class="node"><title>t16</title>
+<polygon fill="#efa03b" stroke="black" points="1380.34,-270.208 1159.66,-270.208 1155.66,-266.208 1155.66,-234.208 1376.34,-234.208 1380.34,-238.208 1380.34,-270.208"/>
+<polyline fill="none" stroke="black" points="1376.34,-266.208 1155.66,-266.208 "/>
+<polyline fill="none" stroke="black" points="1376.34,-266.208 1376.34,-234.208 "/>
+<polyline fill="none" stroke="black" points="1376.34,-266.208 1380.34,-270.208 "/>
+<text text-anchor="middle" x="1268" y="-246.208" font-family="Times,serif" font-size="20.00">skip_page</text>
+</g>
+<!-- t4&#45;&gt;t16 -->
+<g id="edge20" class="edge"><title>t4&#45;&gt;t16</title>
+<path fill="none" stroke="#0044a0" d="M1258.35,-631.473C1326.7,-619.809 1399,-591.745 1399,-525.208 1399,-525.208 1399,-525.208 1399,-397.208 1399,-350.33 1418.37,-328.748 1389,-292.208 1383.58,-285.469 1376.99,-279.879 1369.71,-275.244"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1371.3,-272.123 1360.88,-270.231 1367.85,-278.211 1371.3,-272.123"/>
+</g>
+<!-- t14 -->
+<g id="node16" class="node"><title>t14</title>
+<polygon fill="#66ccff" stroke="black" points="1380.24,-338.208 999.76,-338.208 995.76,-334.208 995.76,-302.208 1376.24,-302.208 1380.24,-306.208 1380.24,-338.208"/>
+<polyline fill="none" stroke="black" points="1376.24,-334.208 995.76,-334.208 "/>
+<polyline fill="none" stroke="black" points="1376.24,-334.208 1376.24,-302.208 "/>
+<polyline fill="none" stroke="black" points="1376.24,-334.208 1380.24,-338.208 "/>
+<text text-anchor="middle" x="1188" y="-314.208" font-family="Times,serif" font-size="20.00">tesseract_ocr_and_render_pdf</text>
+</g>
+<!-- t4&#45;&gt;t14 -->
+<g id="edge22" class="edge"><title>t4&#45;&gt;t14</title>
+<path fill="none" stroke="#0044a0" d="M1244.5,-622.179C1297.25,-607.003 1350,-578.503 1350,-525.208 1350,-525.208 1350,-525.208 1350,-465.208 1350,-422.752 1366.76,-403.169 1340,-370.208 1330.4,-358.377 1317.91,-349.368 1304.22,-342.513"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1305.62,-339.304 1295.07,-338.313 1302.7,-345.666 1305.62,-339.304"/>
 </g>
 <!-- t6 -->
 <g id="node7" class="node"><title>t6</title>
-<polygon fill="#efa03b" stroke="black" points="801.95,-393.109 524.05,-393.109 520.05,-389.109 520.05,-357.109 797.95,-357.109 801.95,-361.109 801.95,-393.109"/>
-<polyline fill="none" stroke="black" points="797.95,-389.109 520.05,-389.109 "/>
-<polyline fill="none" stroke="black" points="797.95,-389.109 797.95,-357.109 "/>
-<polyline fill="none" stroke="black" points="797.95,-389.109 801.95,-393.109 "/>
-<text text-anchor="middle" x="661" y="-369.109" font-family="Times,serif" font-size="20.00">preprocess_clean</text>
+<polygon fill="#efa03b" stroke="black" points="1074.74,-542.208 779.258,-542.208 775.258,-538.208 775.258,-506.208 1070.74,-506.208 1074.74,-510.208 1074.74,-542.208"/>
+<polyline fill="none" stroke="black" points="1070.74,-538.208 775.258,-538.208 "/>
+<polyline fill="none" stroke="black" points="1070.74,-538.208 1070.74,-506.208 "/>
+<polyline fill="none" stroke="black" points="1070.74,-538.208 1074.74,-542.208 "/>
+<text text-anchor="middle" x="925" y="-518.208" font-family="Times,serif" font-size="20.00">preprocess_deskew</text>
 </g>
 <!-- t5&#45;&gt;t6 -->
 <g id="edge7" class="edge"><title>t5&#45;&gt;t6</title>
-<path fill="none" stroke="#0044a0" d="M674.891,-415.003C673.495,-411.095 671.979,-406.852 670.48,-402.652"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="673.731,-401.351 667.072,-393.111 667.139,-403.705 673.731,-401.351"/>
+<path fill="none" stroke="#0044a0" d="M1042.38,-564.102C1024.52,-558.185 1004.35,-551.5 985.823,-545.362"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="986.901,-542.032 976.308,-542.209 984.699,-548.677 986.901,-542.032"/>
 </g>
-<!-- t5&#45;&gt;t8 -->
-<g id="edge11" class="edge"><title>t5&#45;&gt;t8</title>
-<path fill="none" stroke="#0044a0" d="M781.944,-415.046C792.967,-409.579 803.051,-402.434 811,-393.109 822.009,-380.195 824.454,-361.215 824.174,-345.581"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="827.659,-345.2 823.617,-335.407 820.669,-345.583 827.659,-345.2"/>
+<!-- t9 -->
+<g id="node11" class="node"><title>t9</title>
+<polygon fill="#efa03b" stroke="black" points="1013,-426.208 694.762,-398.208 1013,-370.208 1331.24,-398.208 1013,-426.208"/>
+<text text-anchor="middle" x="1013" y="-392.208" font-family="Times,serif" font-size="20.00">select_image_for_pdf</text>
+</g>
+<!-- t5&#45;&gt;t9 -->
+<g id="edge13" class="edge"><title>t5&#45;&gt;t9</title>
+<path fill="none" stroke="#0044a0" d="M1093.89,-563.996C1093.29,-548.44 1091.11,-525.146 1084,-506.208 1073.94,-479.426 1056.13,-452.609 1040.86,-432.521"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1043.62,-430.369 1034.72,-424.619 1038.09,-434.663 1043.62,-430.369"/>
 </g>
 <!-- t7 -->
 <g id="node8" class="node"><title>t7</title>
-<polygon fill="#efa03b" stroke="black" points="643.666,-335.109 354.334,-335.109 350.334,-331.109 350.334,-299.109 639.666,-299.109 643.666,-303.109 643.666,-335.109"/>
-<polyline fill="none" stroke="black" points="639.666,-331.109 350.334,-331.109 "/>
-<polyline fill="none" stroke="black" points="639.666,-331.109 639.666,-299.109 "/>
-<polyline fill="none" stroke="black" points="639.666,-331.109 643.666,-335.109 "/>
-<text text-anchor="middle" x="497" y="-311.109" font-family="Times,serif" font-size="20.00">ocr_tesseract_hocr</text>
+<polygon fill="#efa03b" stroke="black" points="993.95,-484.208 716.05,-484.208 712.05,-480.208 712.05,-448.208 989.95,-448.208 993.95,-452.208 993.95,-484.208"/>
+<polyline fill="none" stroke="black" points="989.95,-480.208 712.05,-480.208 "/>
+<polyline fill="none" stroke="black" points="989.95,-480.208 989.95,-448.208 "/>
+<polyline fill="none" stroke="black" points="989.95,-480.208 993.95,-484.208 "/>
+<text text-anchor="middle" x="853" y="-460.208" font-family="Times,serif" font-size="20.00">preprocess_clean</text>
 </g>
 <!-- t6&#45;&gt;t7 -->
 <g id="edge8" class="edge"><title>t6&#45;&gt;t7</title>
-<path fill="none" stroke="#0044a0" d="M610.903,-357.003C593.736,-351.141 574.358,-344.524 556.518,-338.433"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="557.384,-335.03 546.79,-335.111 555.122,-341.654 557.384,-335.03"/>
+<path fill="none" stroke="#0044a0" d="M903.006,-506.102C896.726,-501.216 889.771,-495.807 883.095,-490.615"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="884.901,-487.586 874.859,-484.209 880.604,-493.111 884.901,-487.586"/>
 </g>
-<!-- t6&#45;&gt;t8 -->
-<g id="edge10" class="edge"><title>t6&#45;&gt;t8</title>
-<path fill="none" stroke="#0044a0" d="M709.875,-357.003C726.624,-351.141 745.529,-344.524 762.933,-338.433"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="764.142,-341.718 772.425,-335.111 761.83,-335.111 764.142,-341.718"/>
+<!-- t6&#45;&gt;t9 -->
+<g id="edge12" class="edge"><title>t6&#45;&gt;t9</title>
+<path fill="none" stroke="#0044a0" d="M977.454,-506.003C987.329,-500.504 996.562,-493.377 1003,-484.208 1012.67,-470.441 1015.74,-452.229 1016.16,-436.195"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1019.66,-436.018 1016.09,-426.041 1012.66,-436.063 1019.66,-436.018"/>
 </g>
-<!-- t10 -->
-<g id="node9" class="node"><title>t10</title>
-<polygon fill="#efa03b" stroke="black" points="620.109,-277.109 335.891,-277.109 331.891,-273.109 331.891,-241.109 616.109,-241.109 620.109,-245.109 620.109,-277.109"/>
-<polyline fill="none" stroke="black" points="616.109,-273.109 331.891,-273.109 "/>
-<polyline fill="none" stroke="black" points="616.109,-273.109 616.109,-241.109 "/>
-<polyline fill="none" stroke="black" points="616.109,-273.109 620.109,-277.109 "/>
-<text text-anchor="middle" x="476" y="-253.109" font-family="Times,serif" font-size="20.00">render_hocr_page</text>
+<!-- t8 -->
+<g id="node9" class="node"><title>t8</title>
+<polygon fill="#00cc66" stroke="black" points="676.666,-416.208 387.334,-416.208 383.334,-412.208 383.334,-380.208 672.666,-380.208 676.666,-384.208 676.666,-416.208"/>
+<polyline fill="none" stroke="black" points="672.666,-412.208 383.334,-412.208 "/>
+<polyline fill="none" stroke="black" points="672.666,-412.208 672.666,-380.208 "/>
+<polyline fill="none" stroke="black" points="672.666,-412.208 676.666,-416.208 "/>
+<text text-anchor="middle" x="530" y="-392.208" font-family="Times,serif" font-size="20.00">ocr_tesseract_hocr</text>
 </g>
-<!-- t7&#45;&gt;t10 -->
-<g id="edge9" class="edge"><title>t7&#45;&gt;t10</title>
-<path fill="none" stroke="#0044a0" d="M490.585,-299.003C489.12,-295.095 487.528,-290.852 485.953,-286.652"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="489.164,-285.245 482.376,-277.111 482.61,-287.703 489.164,-285.245"/>
+<!-- t7&#45;&gt;t8 -->
+<g id="edge9" class="edge"><title>t7&#45;&gt;t8</title>
+<path fill="none" stroke="#0044a0" d="M769.399,-448.125C724.645,-438.98 669.394,-427.691 623.252,-418.262"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="623.748,-414.791 613.25,-416.219 622.347,-421.65 623.748,-414.791"/>
+</g>
+<!-- t7&#45;&gt;t9 -->
+<g id="edge11" class="edge"><title>t7&#45;&gt;t9</title>
+<path fill="none" stroke="#0044a0" d="M894.62,-448.039C911.413,-441.112 931.162,-432.966 949.666,-425.333"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="951.009,-428.565 958.918,-421.516 948.339,-422.094 951.009,-428.565"/>
 </g>
 <!-- t11 -->
-<g id="node13" class="node"><title>t11</title>
-<polygon fill="#efa03b" stroke="black" points="985.486,-277.109 642.514,-277.109 638.514,-273.109 638.514,-241.109 981.486,-241.109 985.486,-245.109 985.486,-277.109"/>
-<polyline fill="none" stroke="black" points="981.486,-273.109 638.514,-273.109 "/>
-<polyline fill="none" stroke="black" points="981.486,-273.109 981.486,-241.109 "/>
-<polyline fill="none" stroke="black" points="981.486,-273.109 985.486,-277.109 "/>
-<text text-anchor="middle" x="812" y="-253.109" font-family="Times,serif" font-size="20.00">render_hocr_debug_page</text>
-</g>
-<!-- t7&#45;&gt;t11 -->
-<g id="edge18" class="edge"><title>t7&#45;&gt;t11</title>
-<path fill="none" stroke="#0044a0" d="M592.793,-299.079C628.531,-292.726 669.303,-285.478 705.912,-278.969"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="706.887,-282.351 716.12,-277.155 705.661,-275.459 706.887,-282.351"/>
-</g>
-<!-- t12 -->
-<g id="node12" class="node"><title>t12</title>
-<polygon fill="#efa03b" stroke="black" points="607.082,-219.109 348.918,-219.109 344.918,-215.109 344.918,-183.109 603.082,-183.109 607.082,-187.109 607.082,-219.109"/>
-<polyline fill="none" stroke="black" points="603.082,-215.109 344.918,-215.109 "/>
-<polyline fill="none" stroke="black" points="603.082,-215.109 603.082,-183.109 "/>
-<polyline fill="none" stroke="black" points="603.082,-215.109 607.082,-219.109 "/>
-<text text-anchor="middle" x="476" y="-195.109" font-family="Times,serif" font-size="20.00">add_text_layer</text>
-</g>
-<!-- t10&#45;&gt;t12 -->
-<g id="edge15" class="edge"><title>t10&#45;&gt;t12</title>
-<path fill="none" stroke="#0044a0" d="M476,-241.003C476,-237.312 476,-233.322 476,-229.352"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="479.5,-229.111 476,-219.111 472.5,-229.111 479.5,-229.111"/>
-</g>
-<!-- t8&#45;&gt;t9 -->
-<g id="edge13" class="edge"><title>t8&#45;&gt;t9</title>
-<path fill="none" stroke="#0044a0" d="M661.842,-299.864C658.871,-299.606 655.921,-299.354 653,-299.109 509.812,-287.095 471.159,-289.734 324.542,-277.219"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="324.526,-273.705 314.262,-276.332 323.924,-280.679 324.526,-273.705"/>
+<g id="node10" class="node"><title>t11</title>
+<polygon fill="#00cc66" stroke="black" points="938.109,-338.208 653.891,-338.208 649.891,-334.208 649.891,-302.208 934.109,-302.208 938.109,-306.208 938.109,-338.208"/>
+<polyline fill="none" stroke="black" points="934.109,-334.208 649.891,-334.208 "/>
+<polyline fill="none" stroke="black" points="934.109,-334.208 934.109,-302.208 "/>
+<polyline fill="none" stroke="black" points="934.109,-334.208 938.109,-338.208 "/>
+<text text-anchor="middle" x="794" y="-314.208" font-family="Times,serif" font-size="20.00">render_hocr_page</text>
 </g>
 <!-- t8&#45;&gt;t11 -->
-<g id="edge17" class="edge"><title>t8&#45;&gt;t11</title>
-<path fill="none" stroke="#0044a0" d="M818.251,-299.003C817.64,-295.204 816.979,-291.087 816.322,-287.002"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="819.775,-286.429 814.732,-277.111 812.864,-287.539 819.775,-286.429"/>
+<g id="edge10" class="edge"><title>t8&#45;&gt;t11</title>
+<path fill="none" stroke="#0044a0" d="M589.247,-380.152C629.442,-368.58 682.727,-353.241 724.863,-341.111"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="725.853,-344.468 734.495,-338.338 723.917,-337.741 725.853,-344.468"/>
 </g>
-<!-- t8&#45;&gt;t13 -->
-<g id="edge20" class="edge"><title>t8&#45;&gt;t13</title>
-<path fill="none" stroke="#0044a0" d="M935.04,-299.079C978.311,-292.618 1027.78,-285.23 1071.94,-278.636"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1072.48,-282.093 1081.86,-277.155 1071.45,-275.17 1072.48,-282.093"/>
+<!-- t12 -->
+<g id="node14" class="node"><title>t12</title>
+<polygon fill="#00cc66" stroke="black" points="1118.49,-270.208 775.514,-270.208 771.514,-266.208 771.514,-234.208 1114.49,-234.208 1118.49,-238.208 1118.49,-270.208"/>
+<polyline fill="none" stroke="black" points="1114.49,-266.208 771.514,-266.208 "/>
+<polyline fill="none" stroke="black" points="1114.49,-266.208 1114.49,-234.208 "/>
+<polyline fill="none" stroke="black" points="1114.49,-266.208 1118.49,-270.208 "/>
+<text text-anchor="middle" x="945" y="-246.208" font-family="Times,serif" font-size="20.00">render_hocr_debug_page</text>
+</g>
+<!-- t8&#45;&gt;t12 -->
+<g id="edge19" class="edge"><title>t8&#45;&gt;t12</title>
+<path fill="none" stroke="#0044a0" d="M620.537,-380.161C641.947,-376.512 664.736,-372.939 686,-370.208 714.866,-366.5 927.304,-369.633 947,-348.208 963.502,-330.256 960.281,-301.363 954.611,-280.149"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="957.925,-279.012 951.707,-270.433 951.218,-281.017 957.925,-279.012"/>
+</g>
+<!-- t13 -->
+<g id="node13" class="node"><title>t13</title>
+<polygon fill="#00cc66" stroke="black" points="753.082,-270.208 494.918,-270.208 490.918,-266.208 490.918,-234.208 749.082,-234.208 753.082,-238.208 753.082,-270.208"/>
+<polyline fill="none" stroke="black" points="749.082,-266.208 490.918,-266.208 "/>
+<polyline fill="none" stroke="black" points="749.082,-266.208 749.082,-234.208 "/>
+<polyline fill="none" stroke="black" points="749.082,-266.208 753.082,-270.208 "/>
+<text text-anchor="middle" x="622" y="-246.208" font-family="Times,serif" font-size="20.00">add_text_layer</text>
+</g>
+<!-- t11&#45;&gt;t13 -->
+<g id="edge16" class="edge"><title>t11&#45;&gt;t13</title>
+<path fill="none" stroke="#0044a0" d="M749.258,-302.039C726.862,-293.446 699.574,-282.975 676.019,-273.936"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="677.108,-270.605 666.518,-270.29 674.6,-277.14 677.108,-270.605"/>
+</g>
+<!-- t9&#45;&gt;t10 -->
+<g id="edge14" class="edge"><title>t9&#45;&gt;t10</title>
+<path fill="none" stroke="#0044a0" d="M877.633,-382.056C761.19,-369.023 593.788,-350.286 475.578,-337.054"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="475.697,-333.546 465.37,-335.912 474.919,-340.503 475.697,-333.546"/>
 </g>
 <!-- t9&#45;&gt;t12 -->
-<g id="edge16" class="edge"><title>t9&#45;&gt;t12</title>
-<path fill="none" stroke="#0044a0" d="M259.577,-241.079C294.86,-234.726 335.115,-227.478 371.259,-220.969"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="372.116,-224.372 381.337,-219.155 370.875,-217.482 372.116,-224.372"/>
+<g id="edge18" class="edge"><title>t9&#45;&gt;t12</title>
+<path fill="none" stroke="#0044a0" d="M998.887,-371.447C994.931,-364.003 990.702,-355.831 987,-348.208 983.822,-341.663 967.96,-305.616 956.669,-279.865"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="959.82,-278.337 952.601,-270.582 953.409,-281.146 959.82,-278.337"/>
 </g>
-<!-- t16 -->
-<g id="node17" class="node"><title>t16</title>
-<polygon fill="#efa03b" stroke="black" points="1031.47,-105.333 1196,-78.005 1360.53,-105.333 1360.37,-149.551 1031.63,-149.551 1031.47,-105.333"/>
-<polygon fill="none" stroke="black" points="1027.46,-101.94 1196,-73.9453 1364.54,-101.94 1364.36,-153.556 1027.64,-153.556 1027.46,-101.94"/>
-<text text-anchor="middle" x="1196" y="-111.555" font-family="Times,serif" font-size="20.00">merge_pages</text>
+<!-- t9&#45;&gt;t14 -->
+<g id="edge21" class="edge"><title>t9&#45;&gt;t14</title>
+<path fill="none" stroke="#0044a0" d="M1065.03,-374.611C1088.59,-364.381 1116.27,-352.359 1139.4,-342.314"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1140.9,-345.479 1148.68,-338.285 1138.11,-339.058 1140.9,-345.479"/>
 </g>
-<!-- t12&#45;&gt;t16 -->
-<g id="edge26" class="edge"><title>t12&#45;&gt;t16</title>
-<path fill="none" stroke="#0044a0" d="M607.222,-185.246C722.142,-172.229 890.172,-153.196 1017.34,-138.791"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1018.04,-142.235 1027.58,-137.632 1017.25,-135.279 1018.04,-142.235"/>
-</g>
-<!-- t11&#45;&gt;t16 -->
-<g id="edge27" class="edge"><title>t11&#45;&gt;t16</title>
-<path fill="none" stroke="#0044a0" d="M859.086,-240.997C916.223,-220.232 1014.29,-184.591 1089.94,-157.099"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1091.32,-160.323 1099.52,-153.618 1088.92,-153.744 1091.32,-160.323"/>
-</g>
-<!-- t15&#45;&gt;t16 -->
-<g id="edge23" class="edge"><title>t15&#45;&gt;t16</title>
-<path fill="none" stroke="#0044a0" d="M1321.98,-414.938C1359.16,-396.916 1407,-364.681 1407,-318.109 1407,-318.109 1407,-318.109 1407,-258.109 1407,-211.469 1370.69,-179.509 1328.2,-158.076"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1329.57,-154.854 1319.04,-153.66 1326.53,-161.158 1329.57,-154.854"/>
-</g>
-<!-- t13&#45;&gt;t16 -->
-<g id="edge25" class="edge"><title>t13&#45;&gt;t16</title>
-<path fill="none" stroke="#0044a0" d="M1196,-240.997C1196,-221.914 1196,-190.265 1196,-163.926"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1199.5,-163.759 1196,-153.759 1192.5,-163.759 1199.5,-163.759"/>
-</g>
-<!-- t14&#45;&gt;t16 -->
-<g id="edge24" class="edge"><title>t14&#45;&gt;t16</title>
-<path fill="none" stroke="#0044a0" d="M1326.64,-588.956C1373.58,-572.748 1427,-543.103 1427,-492.109 1427,-492.109 1427,-492.109 1427,-258.109 1427,-220.539 1416.55,-207.537 1388,-183.109 1376.82,-173.542 1364.16,-165.377 1350.82,-158.413"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1351.99,-155.087 1341.47,-153.781 1348.88,-161.358 1351.99,-155.087"/>
+<!-- t10&#45;&gt;t13 -->
+<g id="edge17" class="edge"><title>t10&#45;&gt;t13</title>
+<path fill="none" stroke="#0044a0" d="M417.688,-300.029C455.345,-291.399 499.718,-281.231 537.473,-272.578"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="538.461,-275.943 547.427,-270.297 536.898,-269.12 538.461,-275.943"/>
 </g>
 <!-- t17 -->
 <g id="node18" class="node"><title>t17</title>
-<polygon fill="#efa03b" stroke="black" points="1310.18,-52 1085.82,-52 1081.82,-48 1081.82,-16 1306.18,-16 1310.18,-20 1310.18,-52"/>
-<polyline fill="none" stroke="black" points="1306.18,-48 1081.82,-48 "/>
-<polyline fill="none" stroke="black" points="1306.18,-48 1306.18,-16 "/>
-<polyline fill="none" stroke="black" points="1306.18,-48 1310.18,-52 "/>
-<text text-anchor="middle" x="1196" y="-28" font-family="Times,serif" font-size="20.00">copy_final</text>
+<polygon fill="#efa03b" stroke="black" points="540.724,-156.455 770,-129.143 999.276,-156.455 999.062,-200.646 540.938,-200.646 540.724,-156.455"/>
+<polygon fill="none" stroke="black" points="536.704,-152.903 770,-125.112 1003.3,-152.903 1003.05,-204.648 536.954,-204.648 536.704,-152.903"/>
+<text text-anchor="middle" x="770" y="-162.669" font-family="Times,serif" font-size="20.00">merge_pages_ghostscript</text>
+</g>
+<!-- t13&#45;&gt;t17 -->
+<g id="edge27" class="edge"><title>t13&#45;&gt;t17</title>
+<path fill="none" stroke="#0044a0" d="M653.026,-234.114C665.992,-226.971 681.653,-218.343 697.24,-209.755"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="699.319,-212.606 706.388,-204.715 695.941,-206.475 699.319,-212.606"/>
+</g>
+<!-- t13&#45;&gt;t18 -->
+<g id="edge31" class="edge"><title>t13&#45;&gt;t18</title>
+<path fill="none" stroke="#0044a0" d="M753.329,-235.235C756.584,-234.884 759.812,-234.541 763,-234.208 873.497,-222.668 902.059,-228.201 1012,-212.208 1023.74,-210.5 1035.81,-208.554 1047.95,-206.456"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1048.91,-209.84 1058.16,-204.659 1047.7,-202.946 1048.91,-209.84"/>
+</g>
+<!-- t12&#45;&gt;t17 -->
+<g id="edge28" class="edge"><title>t12&#45;&gt;t17</title>
+<path fill="none" stroke="#0044a0" d="M908.314,-234.114C892.552,-226.77 873.424,-217.858 854.484,-209.033"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="855.759,-205.766 845.216,-204.715 852.803,-212.111 855.759,-205.766"/>
+</g>
+<!-- t12&#45;&gt;t18 -->
+<g id="edge32" class="edge"><title>t12&#45;&gt;t18</title>
+<path fill="none" stroke="#0044a0" d="M1002.86,-234.114C1029.07,-226.37 1061.19,-216.881 1092.64,-207.59"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1093.77,-210.905 1102.37,-204.715 1091.79,-204.192 1093.77,-210.905"/>
 </g>
 <!-- t16&#45;&gt;t17 -->
-<g id="edge28" class="edge"><title>t16&#45;&gt;t17</title>
-<path fill="none" stroke="#0044a0" d="M1196,-73.8665C1196,-69.8921 1196,-65.942 1196,-62.1676"/>
-<polygon fill="#0044a0" stroke="#0044a0" points="1199.5,-62.1213 1196,-52.1214 1192.5,-62.1214 1199.5,-62.1213"/>
+<g id="edge24" class="edge"><title>t16&#45;&gt;t17</title>
+<path fill="none" stroke="#0044a0" d="M1155.57,-234.546C1111.13,-227.821 1059.63,-219.853 1013,-212.208 1001.53,-210.326 989.752,-208.365 977.872,-206.363"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="978.316,-202.888 967.872,-204.672 977.149,-209.79 978.316,-202.888"/>
+</g>
+<!-- t16&#45;&gt;t18 -->
+<g id="edge29" class="edge"><title>t16&#45;&gt;t18</title>
+<path fill="none" stroke="#0044a0" d="M1258.03,-233.915C1254.58,-227.933 1250.55,-220.928 1246.43,-213.785"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1249.24,-211.645 1241.21,-204.729 1243.17,-215.141 1249.24,-211.645"/>
+</g>
+<!-- t14&#45;&gt;t17 -->
+<g id="edge26" class="edge"><title>t14&#45;&gt;t17</title>
+<path fill="none" stroke="#0044a0" d="M1172.36,-302.154C1164.33,-293.013 1154.66,-281.362 1147,-270.208 1136.64,-255.121 1141.88,-244.862 1127,-234.208 1125.19,-232.915 1055.67,-220.232 978.45,-206.446"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="978.964,-202.982 968.505,-204.672 977.735,-209.874 978.964,-202.982"/>
+</g>
+<!-- t14&#45;&gt;t18 -->
+<g id="edge30" class="edge"><title>t14&#45;&gt;t18</title>
+<path fill="none" stroke="#0044a0" d="M1310.22,-302.184C1345.8,-294.579 1378.07,-284.119 1389,-270.208 1408.78,-245.028 1391.25,-224.765 1361.2,-209.211"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1362.48,-205.944 1351.96,-204.742 1359.44,-212.246 1362.48,-205.944"/>
+</g>
+<!-- t15&#45;&gt;t17 -->
+<g id="edge25" class="edge"><title>t15&#45;&gt;t17</title>
+<path fill="none" stroke="#0044a0" d="M289.656,-684.797C164.646,-670.853 17,-641.95 17,-583.208 17,-583.208 17,-583.208 17,-319.208 17,-213.417 306.554,-181.327 526.553,-172.213"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="526.794,-175.706 536.646,-171.808 526.514,-168.711 526.794,-175.706"/>
+</g>
+<!-- t19 -->
+<g id="node20" class="node"><title>t19</title>
+<polygon fill="#efa03b" stroke="black" points="844.361,-47.3406 995,-20.006 1145.64,-47.3406 1145.5,-91.5689 844.501,-91.5689 844.361,-47.3406"/>
+<polygon fill="none" stroke="black" points="840.355,-43.9965 995,-15.9349 1149.65,-43.9965 1149.48,-95.5749 840.519,-95.5749 840.355,-43.9965"/>
+<text text-anchor="middle" x="995" y="-53.565" font-family="Times,serif" font-size="20.00">copy_final</text>
+</g>
+<!-- t17&#45;&gt;t19 -->
+<g id="edge35" class="edge"><title>t17&#45;&gt;t19</title>
+<path fill="none" stroke="#0044a0" d="M841.81,-133.486C864.177,-122.839 889.024,-111.011 912.085,-100.034"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="913.64,-103.17 921.165,-95.7118 910.631,-96.8497 913.64,-103.17"/>
+</g>
+<!-- t18&#45;&gt;t19 -->
+<g id="edge34" class="edge"><title>t18&#45;&gt;t19</title>
+<path fill="none" stroke="#0044a0" d="M1151.35,-134.66C1128.23,-123.705 1102.26,-111.399 1078.23,-100.009"/>
+<polygon fill="#0044a0" stroke="#0044a0" points="1079.66,-96.8131 1069.12,-95.6933 1076.66,-103.139 1079.66,-96.8131"/>
 </g>
 </g>
 </svg>
@@ -198,7 +198,7 @@ setup(
        "Intended Audience :: End Users/Desktop",
        "Intended Audience :: Science/Research",
        "Intended Audience :: System Administrators",
-        "License :: Public Domain",
+        "License :: OSI Approved :: MIT License",
        "Operating System :: MacOS :: MacOS X",
        "Operating System :: POSIX",
        "Operating System :: POSIX :: BSD",
@@ -575,7 +575,7 @@ def test_algo4():


@pytest.mark.parametrize('renderer', [
-    'hocr'])  # tesseract cannot pass this test yet
+    'hocr'])  # tesseract cannot pass this test - resamples to square image
 def test_non_square_resolution(renderer, spoof_tesseract_cache):
    # Confirm input image is non-square resolution
    in_pageinfo = pdf_get_all_pageinfo(_infile('aspect.pdf'))
@@ -597,3 +597,15 @@ def test_image_to_pdf(spoof_tesseract_noop):
    check_ocrmypdf(
        'LinnSequencer.jpg', 'image_to_pdf.pdf', '--image-dpi', '200',
        env=spoof_tesseract_noop)
+
+
+def test_jbig2_passthrough(spoof_tesseract_cache):
+    out = check_ocrmypdf(
+        'jbig2.pdf', 'jbig2_out.pdf',
+        '--output-type', 'pdf',
+        '--pdf-renderer', 'hocr',
+        env=spoof_tesseract_cache)
+
+    out_pageinfo = pdf_get_all_pageinfo(out)
+    assert out_pageinfo[0]['images'][0]['enc'] == 'jbig2'
+
Author	SHA1	Message	Date
James R. Barlow	27a3813207	Recover input filename from symlink on error message The recent commit to accept files from stdin broken the feature of returning the input filename on an error, returning the temp filename instead, which is confusing.	2016-08-23 17:38:28 -07:00
James R. Barlow	b06e0bfdcd	Merge branch 'develop'	2016-08-23 16:03:07 -07:00
James R. Barlow	d616f25324	Implement DPI checking for stencil masks	2016-08-23 15:59:34 -07:00
James R. Barlow	b03028e31f	setup.py -> license is MIT	2016-08-19 10:14:33 -07:00
James R. Barlow	e08c42fd3d	Tweak pipeline again	2016-08-09 22:40:29 -07:00
James R. Barlow	16901f7134	Accept input from stdin if input filename is '-'	2016-08-09 15:46:24 -07:00
James R. Barlow	dffceedd85	Update the pipeline image	2016-08-09 15:45:19 -07:00
James R. Barlow	e5541e435c	New test to confirm we can emit JBIG2 with appropriate settings	2016-08-03 11:35:48 -07:00