Merge branch 'master' into feature/drop-3.7

2022-08-06 14:04:23 -07:00
parent 76bd8cab13 b458b1422b
commit 8412de9344
18 changed files with 90 additions and 102 deletions
@@ -1,5 +1,5 @@
-# OCRmyPDF
-#
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0

 FROM ubuntu:22.04 as base

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 # dotfiles
 .*
 !.coveragerc
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 # Always use Unix convention for new lines
 * text eol=lf

@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 # These are supported funding model platforms

 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
 name: General issues
 about: Installation, packages, dependencies, "nothing works", test suite failures...
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
 name: Problem with a specific input file
 about: Something went wrong while trying to OCR a specific file
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: CC-BY-SA-4.0
 ---
 name: Feature request
 about: Suggest an idea for this project
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 # To get started with Dependabot version updates, you'll need to specify which
 # package ecosystems to update and where the package manifests are located.
 # Please see the documentation for all configuration options:
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
 name: Test and deploy

 on:
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: CC-BY-SA-4.0
+
 # dotfiles
 .*
 !.coveragerc
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.3.0
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

@@ -1,3 +1,7 @@
+<!-- SPDX-FileCopyrightText: 2014 Julien Pfefferkorn -->
+<!-- SPDX-FileCopyrightText: 2015 James R. Barlow -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+
 <img src="docs/images/logo.svg" width="240" alt="OCRmyPDF">

 [![Build Status](https://github.com/ocrmypdf/OCRmyPDF/actions/workflows/build.yml/badge.svg)](https://github.com/ocrmypdf/OCRmyPDF/actions/workflows/build.yml) [![PyPI version][pypi]](https://pypi.org/project/ocrmypdf/) ![Homebrew version][homebrew] ![ReadTheDocs][docs] ![Python versions][pyversions]
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MIT
 ---
 version: "3.3"
 services:
@@ -1,3 +1,5 @@
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
 [build-system]
 requires = [
  "setuptools >= 61",
@@ -1,3 +1,7 @@
+# SPDX-FileCopyrightText: 2022 Alexander Langanke
+# SPDX-FileCopyrightText: 2022 James R. Barlow
+# SPDX-License-Identifier: MPL-2.0
+
 name: ocrmypdf
 title: OCRmyPDF
 base: core20
@@ -41,6 +45,13 @@ parts:
    stage-packages:
      - lib32stdc++6

+  jbig2enc:
+    plugin: autotools
+    source: https://github.com/agl/jbig2enc.git
+    source-tag: '0.29'
+    build-packages:
+      - libleptonica-dev
+
  ocrmypdf:
    plugin: python
    source: https://github.com/ocrmypdf/OCRmyPDF.git
@@ -1,3 +1,6 @@
+<!-- SPDX-FileCopyrightText: 2022 James R. Barlow -->
+<!-- SPDX-License-Identifier: CC-BY-SA-4.0 -->
+
 # Release checklist

 ## Patch release
@@ -1,168 +1,105 @@
+.. SPDX-FileCopyrightText: 2022 James R. Barlow
+.. SPDX-License-Identifier: CC-BY-SA-4.0
+
 These test files are used in OCRmyPDF's test suite. They do not necessarily produce OCR results
-at all and are not meant as examples of OCR output. Some are even invalid PDFs that might
+at all and are not necessarily meant as examples of OCR output. Some are even invalid PDFs that might
 crash certain PDF viewers.

-
-Files derived from free sources
-===============================
-
-These test resources come from free sources, under either public domain or Creative Commons licenses.
-In some cases they were converted from one image format to another without other changes.
+Some of these images were obtained from the public domain. Others are copyrighted and may have
+licenses associated. Refer to ``.reuse/dep5`` file in OCRmyPDF's Git repository for information on
+the copyright holder(s) and license(s) applicable to these resources.

 .. list-table::
-    :widths: 20 50 30
+    :widths: 15 35 50
    :header-rows: 1

    *   - File
        - Source
-        - License
+        - Purpose
    *   - c02-22.pdf
        - `Project Gutenberg`_, Adventures of Huckleberry Finn, page 22
-        - Public Domain
+        - difficult OCR image (obscure fonts and illustrations)
    *   - congress.jpg
        - `US Congressional Records`_
-        - Public Domain
+        - difficult OCR image (color background)
    *   - graph.pdf
        - `Wikimedia: Pandas text analysis.png`_
-        - Public Domain
+        - image with slanted text
    *   - lichtenstein.pdf
        - `Wikimedia: JPEG2000 Lichtenstein`_
-        - Creative Commons BY-SA 3.0
+        - JPEG2000 image
    *   - linn.png, linn.pdf, linn.txt
        - `Wikimedia: LinnSequencer`_
-        - Creative Commons BY-SA 3.0
+        - image with two columns
    *   - typewriter.png, 2400dpi.pdf
        - `Wikimedia: Triumph typewrtier text Linzensoep`_
-        - Creative Commons BY-SA 2.5
+        - simple text
    *   - baiona.png
        - `Wikimedia: Baionako udalerri mugakideak`_
-        - Creative Commons BY-SA 4.0
-    *   - enron1.pdf
-        - EnronData.org
-        - Creative Commons BY 3.0
-
-
-Files generated for this project
-================================
-
-The following test resources were crafted specifically for this project, and are
-licensed under the specified license.
-
-.. list-table::
-    :widths: 20 40 15 15 10
-    :header-rows: 1
-
-    *   - File
-        - Purpose
-        - Contributor
-        - Copyright Holder
-        - License
+        - multilingual text and images
    *   - aspect.pdf
+        - synthetic
        - test image with 200 x 100 DPI resolution
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - blank.pdf
+        - synthetic
        - blank PDF generated by Adobe Illustrator CC 17, containing a lot of application-specific metadata/bloat
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - cmyk.pdf
+        - synthetic
        - a CMYK image created in Photoshop
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - crom.png
+        - synthetic
        - test for non-dictionary words
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - enormous.pdf
+        - synthetic
        - very large PDF page
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - epson.pdf
+        - synthetic
        - a linearized PDF containing some unusual indirect objects, created by an Epson printer; printout of a Wikipedia article (CC-BY-SA)
-        - @lowesjam
-        - Wikipedia authors
-        - CC-BY-SA 3.0
    *   - formxobject.pdf
+        - synthetic
        - hand-crafted PDF containing an image inside a Form XObject
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - francais.pdf
+        - synthetic
        - a page containing French accents (diacritics)
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - hugemono.pdf
+        - synthetic
        - large monochrome 35000x35000 image in JBIG2 encoding
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - invalid.pdf
+        - synthetic
        - a PDF file header followed by EOF marker
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - kcs.pdf
+        - synthetic
        - PDF file generated by Kodak Capture Desktop Software 1.2; has invalid table of contents
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - livecycle.pdf
+        - synthetic
        - a minimal PDF that claims to use dynamic XFA forms
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - masks.pdf
+        - synthetic
        - file containing explicit masks and a stencil mask drawn without a proper transformation matrix; printout of a German Wikipedia article (CC-BY-SA)
-        - @supergrobi
-        - Wikipedia authors
-        - CC-BY-SA 3.0
    *   - missing_docinfo.pdf
+        - synthetic
        - PDF file with no /DocumentInfo section
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - overlay.pdf
+        - synthetic
        - PDF file generated by PDFPen pro that triggered content stream parse errors
-        - @maxandersen
-        - @maxandersen
-        - CC-BY-SA 4.0
    *   - negzero.pdf
+        - synthetic
        - copy of formxobject.pdf with token that qpdf doesn't like
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - no_contents.pdf
+        - synthetic
        - synthetic PDF with a blank page that has no /Contents entry
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - truetype_font_nomapping.pdf
+        - synthetic
        - example of a PDF with an embedded subsetted TrueType font with no Unicode mapping
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - trivial.pdf
+        - synthetic
        - smallest possible valid PDF-1.3 with all required fields
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - type3_font_nomapping.pdf
+        - synthetic
        - example of a PDF with an embedded subsetted TrueType font with no Unicode mapping
-        - @jbarlow83
-        - @jbarlow83
-        - CC-BY-SA 4.0
    *   - vector.pdf
+        - synthetic
        - a PDF with vector art and text rendered as curves with no fonts
-        - @Catscratch
-        - @Catscratch
-        - CC-BY-SA 4.0
-

 Assemblies
 ==========