Merge pull request #271 from JorjMcKie/master

upload v1.14.12

Author: JorjMcKie

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: PyMuPDF
-Version: 1.14.11
+Version: 1.14.12
 Author: Ruikai Liu
 Author-email: [email protected]
 Maintainer: Jorj X. McKie
@@ -21,7 +21,7 @@ Description:
         Introduction
         ============
 
-        This is **version 1.14.11 of PyMuPDF**, a Python binding for `MuPDF <http://mupdf.com/>`_ - "a lightweight PDF and XPS viewer".
+        This is **version 1.14.12 of PyMuPDF**, a Python binding for `MuPDF <http://mupdf.com/>`_ - "a lightweight PDF and XPS viewer".
 
         MuPDF can access files in PDF, XPS, OpenXPS, epub, comic and fiction book formats, and it is known for both, its top performance and high rendering quality.
 

README.md

@@ -1,4 +1,4 @@
-# PyMuPDF 1.14.11
+# PyMuPDF 1.14.12
 
 ![logo](https://github.com/pymupdf/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
@@ -14,7 +14,7 @@ On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://
 
 # Introduction
 
-This is **version 1.14.11 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.14.x](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
+This is **version 1.14.12 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.14.x](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.
 

doc/PyMuPDF.pdf

@@ -35,6 +35,7 @@
 fitz.Document.setToC = fitz.utils.setToC
 fitz.Document.searchPageFor = fitz.utils.searchPageFor
 fitz.Document.newPage = fitz.utils.newPage
+fitz.Document.insertPage = fitz.utils.insertPage
 fitz.Document.getCharWidths = fitz.utils.getCharWidths
 
 # ------------------------------------------------------------------------------

doc/html.zip

@@ -1059,29 +1059,10 @@ if links:
         //---------------------------------------------------------------------
         // Create and insert a new page (PDF)
         //---------------------------------------------------------------------
-        FITZEXCEPTION(insertPage, result<0)
-        %feature("autodoc","Insert a new page in front of 'pno'. Use arguments 'width', 'height' to specify a non-default page size, and optionally text insertion arguments.") insertPage;
-        %pythonprepend insertPage %{
-        if self.isClosed or self.isEncrypted:
-            raise ValueError("operation illegal for closed / encrypted doc")
-        if bool(text):
-            CheckColor(color)
-            if fontname and fontname[0] == "/":
-                raise ValueError("invalid font reference")
-        %}
-        %pythonappend insertPage %{
-        if val < 0: return val
-        self._reset_page_refs()
-        if not bool(text): return val
-        page = self.loadPage(pno)
-        val = page.insertText(Point(50, 72), text, fontsize = fontsize,
-                              fontname = fontname, fontfile = fontfile,
-                              color = color, set_simple = set_simple)
-        %}
-        int insertPage(int pno = -1, PyObject *text = NULL, float fontsize = 11,
-                       float width = 595, float height = 842,
-                       char *fontname = NULL, char *fontfile = NULL,
-                       int set_simple = 0, PyObject *color = NULL)
+        FITZEXCEPTION(_newPage, !result)
+        CLOSECHECK(_newPage)
+        %pythonappend _newPage %{self._reset_page_refs()%}
+        PyObject *_newPage(int pno=-1, float width=595, float height=842)
         {
             pdf_document *pdf = pdf_specifics(gctx, $self);
             fz_rect mediabox = { 0, 0, 595, 842 };    // ISO-A4 portrait values
@@ -1095,25 +1076,22 @@ if links:
                 if (pno < -1) THROWMSG("invalid page number(s)");
                 // create /Resources and /Contents objects
                 resources = pdf_add_object_drop(gctx, pdf, pdf_new_dict(gctx, pdf, 1));
-                contents = fz_new_buffer(gctx, 10);
-                fz_append_string(gctx, contents, "");
-                fz_terminate_buffer(gctx, contents);
                 page_obj = pdf_add_page(gctx, pdf, mediabox, 0, resources, contents);
-                pdf_insert_page(gctx, pdf, pno , page_obj);
+                pdf_insert_page(gctx, pdf, pno, page_obj);
             }
             fz_always(gctx)
             {
                 fz_drop_buffer(gctx, contents);
                 pdf_drop_obj(gctx, page_obj);
             }
-            fz_catch(gctx) return -1;
+            fz_catch(gctx) return NULL;
             pdf->dirty = 1;
-            return 0;
+            return NONE;
         }
 
         //---------------------------------------------------------------------
         // Create sub-document to keep only selected pages.
-        // Parameter is a Python list of the wanted page numbers.
+        // Parameter is a Python sequence of the wanted page numbers.
         //---------------------------------------------------------------------
         FITZEXCEPTION(select, !result)
         %feature("autodoc","Build sub-pdf with page numbers in 'list'.") select;

fitz/__init__.py

@@ -105,9 +105,9 @@ class _object:
 
 
 VersionFitz = "1.14.0"
-VersionBind = "1.14.11"
-VersionDate = "2019-03-18 08:26:46"
-version = (VersionBind, VersionFitz, "20190318082646")
+VersionBind = "1.14.12"
+VersionDate = "2019-03-21 06:59:25"
+version = (VersionBind, VersionFitz, "20190321065925")
 
 
 class Matrix():
@@ -129,8 +129,8 @@ def __init__(self, *args):
         if len(args) == 1:                       # either an angle or a sequ
             if hasattr(args[0], "__float__"):
                 theta = math.radians(args[0])
-                c = round(math.cos(theta), 8)
-                s = round(math.sin(theta), 8)
+                c = round(math.cos(theta), 12)
+                s = round(math.sin(theta), 12)
                 self.a = self.d = c
                 self.b = s
                 self.c = -s
@@ -222,8 +222,8 @@ def preRotate(self, theta):
 
         else:
             rad = math.radians(theta)
-            s = round(math.sin(rad), 8)
-            c = round(math.cos(rad), 8)
+            s = round(math.sin(rad), 12)
+            c = round(math.cos(rad), 12)
             a = self.a
             b = self.b
             self.a = c * a + s * self.c
@@ -1460,15 +1460,15 @@ def getPDFnow():
         pass
     return tstamp
 
-#-------------------------------------------------------------------------------
-# Return a PDF string depending on its coding.
-# If only ascii then "(original)" is returned,
-# else if only 8 bit chars then "(original)" with interspersed octal strings
-# \nnn is returned,
-# else a string "<FEFF[hexstring]>" is returned, where [hexstring] is the
-# UTF-16BE encoding of the original.
-#-------------------------------------------------------------------------------
 def getPDFstr(s):
+    """ Return a PDF string depending on its coding.
+
+    Notes:
+        If only ascii then "(original)" is returned, else if only 8 bit chars
+        then "(original)" with interspersed octal strings \nnn is returned,
+        else a string "<FEFF[hexstring]>" is returned, where [hexstring] is the
+        UTF-16BE encoding of the original.
+    """
     if not bool(s):
         return "()"
 
@@ -1515,15 +1515,17 @@ def make_utf16be(s):
     return "(" + r + ")"
 
 def getTJstr(text, glyphs, simple, ordering):
-    """Return a PDF string enclosed in [] brackets, suitable for the PDF TJ
+    """ Return a PDF string enclosed in [] brackets, suitable for the PDF TJ
     operator.
-    The input string is converted to either 2 or 4 hex digits per character.
-    * simple:
-       - no glyphs: 2-chars, use char codes as the glyph
-       - glyphs: 2-chars, use glyphs instead of char codes (Symbol, ZapfDingbats)
-    * not simple:
-       - ordering < 0: 4-chars, use glyphs not char codes
-       - ordering >=0: a CJK font! 4 chars, use char codes as glyphs
+
+    Notes:
+        The input string is converted to either 2 or 4 hex digits per character.
+    Args:
+        simple: no glyphs: 2-chars, use char codes as the glyph
+                glyphs: 2-chars, use glyphs instead of char codes (Symbol,
+                ZapfDingbats)
+        not simple: ordering < 0: 4-chars, use glyphs not char codes
+                    ordering >=0: a CJK font! 4 chars, use char codes as glyphs
 """
     if text.startswith("[<") and text.endswith(">]"): # already done
         return text
@@ -1625,10 +1627,34 @@ def CheckParent(o):
 
 def CheckColor(c):
     if c is not None:
-        if type(c) not in (list, tuple) or len(c) not in (1, 3, 4) or \
-            min(c) < 0 or max(c) > 1:
+        if (
+            type(c) not in (list, tuple)
+            or len(c) not in (1, 3, 4)
+            or min(c) < 0
+            or max(c) > 1
+        ):
             raise ValueError("need 1, 3 or 4 color components in range 0 to 1")
 
+def ColorCode(c, f):
+    if c is None:
+        return ""
+    if hasattr(c, "__float__"):
+        c = (c,)
+    CheckColor(c)
+    if len(c) == 1:
+        s = "%g " % c[0]
+        return s + "G " if f == "c" else s + "g "
+
+    if len(c) == 3:
+        s = "%g %g %g " % tuple(c)
+        return s + "RG " if f == "c" else s + "rg "
+
+    s = "%g %g %g %g " % tuple(c)
+    return s + "K " if f == "c" else s + "k "
+
+def JM_TUPLE(o):
+    return tuple(map(lambda x: round(x, 8), o))
+
 def CheckMorph(o):
     if not bool(o): return False
     if not (type(o) in (list, tuple) and len(o) == 2):
@@ -2138,27 +2164,13 @@ def insertPDF(self, docsrc, from_page=-1, to_page=-1, start_at=-1, rotate=-1, li
         return val
 
 
-    def insertPage(self, pno=-1, text=None, fontsize=11, width=595, height=842, fontname=None, fontfile=None, set_simple=0, color=None):
-        """Insert a new page in front of 'pno'. Use arguments 'width', 'height' to specify a non-default page size, and optionally text insertion arguments."""
-
+    def _newPage(self, pno=-1, width=595, height=842):
+        """_newPage(self, pno=-1, width=595, height=842) -> PyObject *"""
         if self.isClosed or self.isEncrypted:
             raise ValueError("operation illegal for closed / encrypted doc")
-        if bool(text):
-            CheckColor(color)
-            if fontname and fontname[0] == "/":
-                raise ValueError("invalid font reference")
 
-
-        val = _fitz.Document_insertPage(self, pno, text, fontsize, width, height, fontname, fontfile, set_simple, color)
-
-        if val < 0: return val
+        val = _fitz.Document__newPage(self, pno, width, height)
         self._reset_page_refs()
-        if not bool(text): return val
-        page = self.loadPage(pno)
-        val = page.insertText(Point(50, 72), text, fontsize = fontsize,
-                              fontname = fontname, fontfile = fontfile,
-                              color = color, set_simple = set_simple)
-
 
         return val