Merge pull request #221 from JorjMcKie/master

Publish v1.14.0

Author: JorjMcKie

.travis.yml

@@ -8,9 +8,8 @@ cache:
   - "$HOME/Library/Caches/Homebrew"
 env:
   global:
-  - MUPDF='https://mupdf.com/downloads/mupdf-1.13.0-source.tar.gz'
+  - MUPDF='https://mupdf.com/downloads/archive/mupdf-1.14.0-source.tar.gz'
   - COPYFILE_DISABLE=1
-  - TWINE_USERNAME=rk700
 matrix:
   include:
   - os: linux
@@ -42,19 +41,17 @@ install:
 - mkdir mupdf && wget -q $MUPDF -O - | tar zx -C mupdf --strip-components=1
 - cp fitz/_mupdf_config.h mupdf/include/mupdf/fitz/config.h
 script:
-- export CIBW_ENVIRONMENT='CFLAGS="-fPIC -std=gnu99"'
 - export CIBW_SKIP="cp33-* *i686"
 - export CIBW_TEST_COMMAND="python -c 'import fitz'"
 - cibuildwheel --output-dir wheelhouse
 
 deploy:
   provider: pages
-  github_token:
-    secure: aZCfaInTGLFs2Ik60w61g/wK7IR4sxK035H+YiKvIrwyufUVuafFlRlG9FLsxrhgYlh7KalNJciD9kdYCgQ3qt21lud9CviBgwNdFGF8LoUhzflr+MzOP51ESnHMgN3t51lN7Ui2RrFlsbST34O28tq8vyPitDS3AMXeuUSZzx8GpsFr/5wRvikd0q1QxF+KkeTp0iVRu4woV0LUNnDylEHRmHdvObuIXkQJunvsXW/Zpxzk8rREdW1/4mBqWV2H8ywk5nptgHfwcjmrpoPHrJOkgXYkXkONzXdC0OuL5SSHLFF4NPNNVdf6Rz4RoGsozI5rDvJ1lEEijz+1sEIQAvghprv9LgiSKs4ECnGtk6J65NCf1KT+3Sj7zcl9C7MmOdJFgnIeWGj5a34i+lGIph30ji3MiBwTnApMyaWHxF6+qshkmN5E+m4Y8XHVAS8gR3EEvLwPR15wmfRATHE2uc1y7p6yNeR95wS5xFqsrXjyZY0/9Ht29JQh/R1NZdLVNJD0/1hcaEhwMSTa1YGmDrUh+wGNjRlPgzS/y3nKG9vwFyPcO8sWaFVMBz1VyqT2ZYQq8Qg2Wtg3r0TvqntwN2ois9KRsr+j8yKGEXkTwZoi/6uL7sjl/NHUL5ps37s1h8GRMdhtQ4dz1s2x+E8kj5cZFGopFybAp44jmdz80wo=
+  github_token: $GITHUB_TOKEN
   keep-history: false
   skip_cleanup: true
   local-dir: wheelhouse
   repo: JorjMcKie/PyMuPDF-wheels
   target-branch: $TRAVIS_OS_NAME
   on:
-    repo: rk700/PyMuPDF
+    repo: JorjMcKie/py-mupdf

README.md

@@ -1,10 +1,10 @@
-# PyMuPDF 1.13.20
+# PyMuPDF 1.14.0
 
 ![logo](https://github.com/rk700/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
-Release date: September 10, 2018
+Release date: November 15, 2018
 
-**Travis-CI:** [![Build Status](https://travis-ci.org/rk700/PyMuPDF.svg?branch=master)](https://travis-ci.org/rk700/PyMuPDF)
+**Travis-CI:** [![Build Status](https://travis-ci.org/JorjMcKie/py-mupdf.svg?branch=master)](https://travis-ci.org/JorjMcKie/py-mupdf)
 
 On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://pepy.tech/badge/pymupdf)](https://pepy.tech/project/pymupdf)
 
@@ -14,7 +14,7 @@ On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://
 
 # Introduction
 
-This is **version 1.13.20 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.13.0](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
+This is **version 1.14.0 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.14.0](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
 
 MuPDF can access files in PDF, XPS, OpenXPS, CBZ, EPUB and FB2 (e-books) formats, and it is known for its top performance and high rendering quality.
 
@@ -32,14 +32,14 @@ The platform tag for Linux is `manylinux1_x86_64`, which makes these wheels usab
 
 On other operating systems you need to generate PyMuPDF yourself. Before you can do this, you must download and generate MuPDF. This process depends very much on your system. For most platforms, the MuPDF source contains prepared procedures for achieving this.
 
-Be sure to download the official MuPDF source release from [here](https://mupdf.com/downloads). Do **not use** MuPDF's [GitHub repo](https://github.com/ArtifexSoftware/mupdf). It contains their current **development source**, which is **not compatible** with the published PyMuPDF version most of the time.
+Be sure to download the official MuPDF source release from [here](https://mupdf.com/downloads). Do **not use** MuPDF's [GitHub repo](https://github.com/ArtifexSoftware/mupdf). It contains their current **development source**, which is **not compatible** with this PyMuPDF version most of the time.
 
-Once this is done, adjust directories in ``setup.py`` and the rest should be as easy as running the usual ``python setup.py install``.
+Once this is done, adjust directories in ``setup.py`` and run ``python setup.py install``.
 
-The following sections contain some platform-specific comments.
+The following sections contain further comments for some platforms.
 
 ## Ubuntu
-One of our users (thanks to **@gileadslostson**!) has documented his MuPDF installation experience from sources in this [Wiki page](https://github.com/rk700/PyMuPDF/wiki/Experience-from-an-Ubuntu-installation).
+Our users (thanks to **@gileadslostson** and **@jbarlow83**!) have documented their MuPDF installation experiences from sources in this [Wiki page](https://github.com/rk700/PyMuPDF/wiki/Experience-from-an-Ubuntu-installation).
 
 ## OSX
 First, install the MuPDF headers and libraries, which are provided by mupdf-tools: ``brew install mupdf-tools``.

doc/PyMuPDF.pdf

@@ -10,7 +10,8 @@
 
 Result
 -------
-A file "poster-input.pdf" with 4 output pages for every input page.
+The file "poster-input.pdf" with 4 output pages for every input page:
+top-lef, top-right, bottom-left, bottom-right part on separate pages.
 
 Notes
 -----

doc/html.zip

@@ -1,30 +1,6 @@
 from __future__ import absolute_import
 from fitz.fitz import *
-
-class M_Identity(fitz.Matrix):
-    """Identity matrix [1, 0, 0, 1, 0, 0]"""
-    def __init__(self):
-        fitz.Matrix.__init__(self, 1.0, 1.0)
-    def __setattr__(self, name, value):
-        if name in "abcdef":
-            raise NotImplementedError("Identity is readonly")
-        else:
-            super(fitz.Matrix, self).__setattr__(name, value)
-
-    def checkargs(*args):
-        raise NotImplementedError("Identity is readonly")
-    preRotate    = checkargs
-    preShear     = checkargs
-    preScale     = checkargs
-    preTranslate = checkargs
-    concat       = checkargs
-    invert       = checkargs
-    def __repr__(self):
-        return "fitz.Identity"
-        
-Identity = M_Identity()
-
-fitz.Identity = Identity
+from fitz import _fitz
 
 # define the supported colorspaces for convenience
 fitz.csRGB    = fitz.Colorspace(fitz.CS_RGB)
@@ -34,6 +10,9 @@ def __repr__(self):
 csGRAY        = fitz.csGRAY
 csCMYK        = fitz.csCMYK
 
+TOOLS         = fitz.Tools()
+fitz.TOOLS    = TOOLS
+
 import fitz.utils
 
 # copy functions to their respective fitz classes
@@ -83,89 +62,17 @@ def __repr__(self):
 #------------------------------------------------------------------------------
 fitz.Pixmap.writeImage      = fitz.utils.writeImage
 
-#------------------------------------------------------------------------------
-# Annot
-#------------------------------------------------------------------------------
-fitz.Annot.updateImage      = fitz.utils.updateImage
-
-#------------------------------------------------------------------------------
-# Matrix algebra
-#------------------------------------------------------------------------------
-fitz.Matrix.__abs__         = fitz.utils.mat_abs
-fitz.Matrix.__add__         = fitz.utils.mat_add
-fitz.Matrix.__bool__        = fitz.utils.mat_true
-fitz.Matrix.__contains__    = fitz.utils.mat_contains
-fitz.Matrix.__div__         = fitz.utils.mat_div
-fitz.Matrix.__eq__          = fitz.utils.mat_equ
-fitz.Matrix.__invert__      = fitz.utils.mat_invert
-fitz.Matrix.__mul__         = fitz.utils.mat_mult
-fitz.Matrix.__neg__         = lambda x: fitz.Matrix(x)*-1 # unary "-"
-fitz.Matrix.__nonzero__     = fitz.utils.mat_true
-fitz.Matrix.__pos__         = lambda x: fitz.Matrix(x)    # unary "+"
-fitz.Matrix.__sub__         = fitz.utils.mat_sub
-fitz.Matrix.__truediv__     = fitz.utils.mat_div
-
-
 #------------------------------------------------------------------------------
 # Rect
 #------------------------------------------------------------------------------
 fitz.Rect.getRectArea       = fitz.utils.getRectArea
 fitz.Rect.getArea           = fitz.utils.getRectArea
-fitz.Rect.intersects        = fitz.utils.intersects
-# Rect algebra
-fitz.Rect.__neg__           = lambda x: fitz.Rect(x)*-1 # unary "-"
-fitz.Rect.__pos__           = lambda x: fitz.Rect(x)    # unary "+"
-fitz.Rect.__abs__           = lambda x: fitz.Rect.getArea(x)  # abs
-fitz.Rect.__or__            = fitz.utils.rect_or
-fitz.Rect.__and__           = fitz.utils.rect_and
-fitz.Rect.__add__           = fitz.utils.rect_add
-fitz.Rect.__sub__           = fitz.utils.rect_sub
-fitz.Rect.__mul__           = fitz.utils.rect_mul
-fitz.Rect.__truediv__       = fitz.utils.rect_div
-fitz.Rect.__div__           = fitz.utils.rect_div
-fitz.Rect.__eq__            = fitz.utils.rect_equ
-fitz.Rect.__nonzero__       = fitz.utils.rect_true
-fitz.Rect.__bool__          = fitz.utils.rect_true
-fitz.Rect.__contains__      = fitz.utils.rect_contains
 
 #------------------------------------------------------------------------------
 # IRect
 #------------------------------------------------------------------------------
 fitz.IRect.getRectArea      = fitz.utils.getRectArea
 fitz.IRect.getArea          = fitz.utils.getRectArea
-fitz.IRect.intersects       = fitz.utils.intersects
-# IRect algebra
-fitz.IRect.__neg__          = lambda x: fitz.IRect(x)*-1 # unary "-"
-fitz.IRect.__pos__          = lambda x: fitz.IRect(x)    # unary "+"
-fitz.IRect.__abs__          = lambda x: fitz.IRect.getArea(x)  # abs
-fitz.IRect.__or__           = fitz.utils.rect_or
-fitz.IRect.__and__          = fitz.utils.rect_and
-fitz.IRect.__add__          = fitz.utils.rect_add
-fitz.IRect.__sub__          = fitz.utils.rect_sub
-fitz.IRect.__mul__          = fitz.utils.rect_mul
-fitz.IRect.__truediv__      = fitz.utils.rect_div
-fitz.IRect.__div__          = fitz.utils.rect_div
-fitz.IRect.__eq__           = fitz.utils.rect_equ
-fitz.IRect.__nonzero__      = fitz.utils.rect_true
-fitz.IRect.__bool__         = fitz.utils.rect_true
-fitz.IRect.__contains__     = fitz.utils.rect_contains
-
-#------------------------------------------------------------------------------
-# Point algebra
-#------------------------------------------------------------------------------
-fitz.Point.__neg__          = lambda x: fitz.Point(x)*-1 # unary "-"
-fitz.Point.__pos__          = lambda x: fitz.Point(x)    # unary "+"
-fitz.Point.__add__          = fitz.utils.point_add
-fitz.Point.__sub__          = fitz.utils.point_sub
-fitz.Point.__abs__          = fitz.utils.point_abs
-fitz.Point.__mul__          = fitz.utils.point_mul
-fitz.Point.__truediv__      = fitz.utils.point_div
-fitz.Point.__div__          = fitz.utils.point_div
-fitz.Point.__nonzero__      = fitz.utils.point_true
-fitz.Point.__bool__         = fitz.utils.point_true
-fitz.Point.__eq__           = fitz.utils.point_equ
-fitz.Point.__contains__     = fitz.utils.point_contains
-
 
 fitz.__doc__ = "PyMuPDF %s: Python bindings for the MuPDF %s library,\nbuilt on %s" \
                % (fitz.VersionBind, fitz.VersionFitz, fitz.VersionDate)