upgrade to 1.16.15

Author: JorjMcKie

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: PyMuPDF
-Version: 1.16.14
+Version: 1.16.15
 Author: Ruikai Liu
 Author-email: [email protected]
 Maintainer: Jorj X. McKie
@@ -9,7 +9,7 @@ Home-page: https://github.com/pymupdf/PyMuPDF
 Download-url: https://github.com/pymupdf/PyMuPDF
 Summary: PyMuPDF is a Python binding for the PDF rendering library MuPDF
 Description:
-        Release date: March 25, 2020
+        Release date: March 27, 2020
 
         Authors
         =======
@@ -20,7 +20,7 @@ Description:
         Introduction
         ============
 
-        This is **version 1.16.14 of PyMuPDF**, a Python binding for `MuPDF <http://mupdf.com/>`_ - "a lightweight PDF and XPS viewer".
+        This is **version 1.16.15 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,8 +1,8 @@
-# PyMuPDF 1.16.14
+# PyMuPDF 1.16.15
 
 ![logo](https://github.com/pymupdf/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
-Release date: March 25, 2020
+Release date: March 27, 2020
 
 **Travis-CI:** [![Build Status](https://travis-ci.org/JorjMcKie/py-mupdf.svg?branch=master)](https://travis-ci.org/JorjMcKie/py-mupdf)
 
@@ -14,7 +14,7 @@ On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://
 
 # Introduction
 
-This is **version 1.16.14 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.16.*](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
+This is **version 1.16.15 of PyMuPDF (formerly python-fitz)**, a Python binding with support for [MuPDF 1.16.*](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.
 
@@ -107,5 +107,4 @@ Earlier versions are available in the [releases](https://github.com/pymupdf/PyMu
 PyMuPDF is distributed under GNU GPL V3. Because you will implicitely also be using MuPDF, its license GNU AFFERO GPL V3 applies as well. Copies of both are included in this repository.
 
 # Contact
-
 Please submit questions, comments or issues [here](https://github.com/pymupdf/PyMuPDF/issues), or directly contact the authors via their e-mail addresses.

docs/annot.rst

@@ -105,19 +105,29 @@ There is a parent-child relationship between an annotation and its page. If the
       :rtype: str
       :returns: the blend mode or *None*.
 
+         >>> annot=page.firstAnnot
+         >>> annot.blendMode()
+         'Multiply'
+
+
    .. method:: setBlendMode(blend_mode)
 
       *(New in v1.16.14)* Set the annotation's blend mode. See :ref:`AdobeManual`, page 520 for explanations. The blend mode can also be set in :meth:`Annot.update`.
 
-      :arg str blend_mode: set the blend mode. Use :meth:`Annot.update` to reflect this in the visual appearance. For predefined values see :ref:`BlendModes`.
+      :arg str blend_mode: set the blend mode. Use :meth:`Annot.update` to reflect this in the visual appearance. For predefined values see :ref:`BlendModes`. The best way to **remove** a special blend mode is choosing ``PDF_BM_Normal``.
+
+         >>> annot.setBlendMode(fitz.PDF_BM_Multiply)
+         >>> annot.update()
+         >>> # or in one statement:
+         >>> annot.update(blend_mode=fitz.PDF_BM_Multiply, ...)
 
    .. method:: setName(name)
 
       *(New in version 1.16.0)* Change the name field of any annotation type. For 'FileAttachment' and 'Text' annotations, this is the icon name, for 'Stamp' annotations the text in the stamp. The visual result (if any) depends on your PDF viewer. See also :ref:`mupdficons`.
 
       :arg str name: the new name.
 
-      .. caution:: If you set the name of a 'Stamp' annotation, then this will **not change** the rectangle, nor will the text be layouted in any way. If you choose a standard text from :ref:`StampIcons` (the **exact** name piece after ``STAMP_``!), you should receive the original layout. An **arbitrary text** will not be changed to upper case, but be written as is, horizontally centered in **one line**. If its length exceeds the available width, it will be accordingly shortened. To ensure your own text will **not be shortened**, ensure that ``fitz.getTextLength(text, fontname="tiro", fontsize=20) / annot.rect.width <= 0.85``.
+      .. caution:: If you set the name of a 'Stamp' annotation, then this will **not change** the rectangle, nor will the text be layouted in any way. If you choose a standard text from :ref:`StampIcons` (the **exact** name piece after "STAMP_"), you should receive the original layout. An **arbitrary text** will not be changed to upper case, but be written as is, horizontally centered in **one line** and be shortened to fit. To avoid this make sure the following inequality is true: ``fitz.getTextlength(text, fontname="tiro", fontsize=20) / annot.rect.width <= 0.85``.
 
    .. method:: setRect(rect)
 

docs/conf.py

@@ -46,7 +46,7 @@
 # built documents.
 #
 # The full version, including alpha/beta/rc tags.
-release = "1.16.14"
+release = "1.16.15"
 
 # The short X.Y version
 version = release

docs/tools.rst

@@ -13,6 +13,8 @@ This class is a collection of utility methods and attributes, mainly around memo
 :meth:`Tools.mupdf_warnings`       return the accumulated MuPDF warnings
 :meth:`Tools.mupdf_display_errors` return the accumulated MuPDF warnings
 :meth:`Tools.reset_mupdf_warnings` empty MuPDF messages on STDOUT
+:meth:`Tools.set_aa_level`         set the anti-aliasing values
+:meth:`Tools.show_aa_level`        return the anti-aliasing values
 :attr:`Tools.fitz_config`          configuration settings of PyMuPDF
 :attr:`Tools.store_maxsize`        maximum storables cache size
 :attr:`Tools.store_size`           current storables cache size
@@ -43,6 +45,21 @@ This class is a collection of utility methods and attributes, mainly around memo
       :rtype: int
       :returns: the new current store size. Depending on the situation, the size reduction may be larger than the requested percentage.
 
+   .. method:: show_aa_level()
+
+      *(New in version 1.16.14)* Return the current anti-aliasing values. These values control the rendering quality of graphics and text elements.
+
+      :rtype: dict
+      :returns: A dictionary with the following initial content: ``{'graphics': 8, 'text': 8, 'graphics_min_line_width': 0.0}``.
+
+
+   .. method:: set_aa_level(level)
+
+      *(New in version 1.16.14)* Set the new number of bits to use for anti-aliasing. The same value is taken currently for graphics and text rendering. This might change in a future MuPDF release.
+
+      :arg int level: an integer ranging between 0 and 8. Value outside this range will be silently changed to valid values. The value will remain in effect throughout the current session or until changed again.
+
+
    .. method:: reset_mupdf_warnings()
 
       *(New in version 1.16.0)*

docs/version.rst

@@ -1,6 +1,6 @@
 Covered Version
 --------------------
 
-This documentation covers PyMuPDF v1.16.14 features as of **2020-03-25 11:44:22**.
+This documentation covers PyMuPDF v1.16.15 features as of **2020-03-26 15:15:15**.
 
 .. note:: The major and minor versions of **PyMuPDF** and **MuPDF** will always be the same. Only the third qualifier (patch level) may be different from that of MuPDF.

fitz/fitz.i

@@ -101,7 +101,7 @@ from __future__ import division, print_function
   #define FLT_EPSILON 1e-5
 #endif
 
-#define return_none return Py_BuildValue("s", NULL)
+#define return_none Py_RETURN_NONE
 #define SWIG_FILE_WITH_INIT
 #define SWIG_PYTHON_2_UNICODE
 
@@ -128,7 +128,6 @@ from __future__ import division, print_function
 #define MIN(a, b) ((a) < (b)) ? (a) : (b)
 
 #define JM_PyErr_Clear if (PyErr_Occurred()) PyErr_Clear()
-#define JM_UNICODE(data) JM_EscapeStrFromStr(data)
 
 // binary output depends on Python major
 # if PY_VERSION_HEX >= 0x03000000
@@ -501,7 +500,7 @@ struct fz_document_s
                     int i, n = pdf_array_len(gctx, names);
                     for (i=0; i < n; i+=2)
                     {
-                        val = JM_UNICODE(pdf_to_text_string(gctx,
+                        val = JM_EscapeStrFromStr(pdf_to_text_string(gctx,
                                          pdf_array_get(gctx, names, i)));
                         LIST_APPEND_DROP(namelist, val);
                     }
@@ -548,15 +547,15 @@ struct fz_document_s
 
                 name = (char *) pdf_to_text_string(gctx,
                                           pdf_dict_get(gctx, o, PDF_NAME(F)));
-                DICT_SETITEM_DROP(infodict, dictkey_filename, JM_UNICODE(name));
+                DICT_SETITEM_DROP(infodict, dictkey_filename, JM_EscapeStrFromStr(name));
 
                 name = (char *) pdf_to_text_string(gctx,
                                     pdf_dict_get(gctx, o, PDF_NAME(UF)));
-                DICT_SETITEM_DROP(infodict, dictkey_ufilename, JM_UNICODE(name));
+                DICT_SETITEM_DROP(infodict, dictkey_ufilename, JM_EscapeStrFromStr(name));
 
                 name = (char *) pdf_to_text_string(gctx,
                                     pdf_dict_get(gctx, o, PDF_NAME(Desc)));
-                DICT_SETITEM_DROP(infodict, dictkey_desc, JM_UNICODE(name));
+                DICT_SETITEM_DROP(infodict, dictkey_desc, JM_UnicodeFromStr(name));
 
                 int len = -1, DL = -1;
                 pdf_obj *ef = pdf_dict_get(gctx, o, PDF_NAME(EF));
@@ -1555,7 +1554,7 @@ if len(pyliste) == 0 or min(pyliste) not in range(len(self)) or max(pyliste) not
                         fz_drop_buffer(gctx, buffer);
                     }
                     tuple = PyTuple_New(4);
-                    PyTuple_SET_ITEM(tuple, 0, JM_UNICODE(pdf_to_name(gctx, bname)));
+                    PyTuple_SET_ITEM(tuple, 0, JM_EscapeStrFromStr(pdf_to_name(gctx, bname)));
                     PyTuple_SET_ITEM(tuple, 1, PyUnicode_FromString(ext));
                     PyTuple_SET_ITEM(tuple, 2, PyUnicode_FromString(pdf_to_name(gctx, subtype)));
                     PyTuple_SET_ITEM(tuple, 3, bytes);
@@ -4284,7 +4283,7 @@ def insertFont(self, fontname="helv", fontfile=None, fontbuffer=None,
                 weiter: ;
                 ixref = pdf_to_num(gctx, font_obj);
 
-                PyObject *name = JM_UNICODE(pdf_to_name(gctx,
+                PyObject *name = JM_EscapeStrFromStr(pdf_to_name(gctx,
                             pdf_dict_get(gctx, font_obj, PDF_NAME(BaseFont))));
 
                 PyObject *subt = PyUnicode_FromString(pdf_to_name(gctx,
@@ -5383,16 +5382,9 @@ struct fz_outline_s {
 */
     %extend {
         %pythoncode %{@property%}
-        %pythonappend uri %{
-        if val:
-            nval = "".join([c for c in val if 32 <= ord(c) <= 127])
-            val = nval
-        else:
-            val = ""
-        %}
         PyObject *uri()
         {
-            return JM_UNICODE($self->uri);
+            return JM_UnicodeFromStr($self->uri);
         }
 
         %pythoncode %{@property%}
@@ -5468,7 +5460,7 @@ struct pdf_annot_s
                 obj = pdf_dict_get(gctx, $self->obj, PDF_NAME(BM));
                 if (obj)  // check the annot object for /BM
                 {
-                    blend_mode = Py_BuildValue("s", pdf_to_name(gctx, obj));
+                    blend_mode = JM_UnicodeFromStr(pdf_to_name(gctx, obj));
                     goto fertig;
                 }
                 // loop through the /AP/N/Resources/ExtGState objects
@@ -5492,7 +5484,7 @@ struct pdf_annot_s
                                 obj2 = pdf_dict_get_key(gctx, obj1, j);
                                 if (pdf_objcmp(gctx, obj2, PDF_NAME(BM)) == 0)
                                 {
-                                    blend_mode = Py_BuildValue("s", pdf_to_name(gctx, pdf_dict_get_val(gctx, obj1, j)));
+                                    blend_mode = JM_UnicodeFromStr(pdf_to_name(gctx, pdf_dict_get_val(gctx, obj1, j)));
                                     goto fertig;
                                 }
                             }
@@ -5616,7 +5608,7 @@ struct pdf_annot_s
                 if (obj)
                 {
                     text = pdf_to_text_string(gctx, obj);
-                    DICT_SETITEM_DROP(values, dictkey_text, Py_BuildValue("s", text));
+                    DICT_SETITEM_DROP(values, dictkey_text, JM_UnicodeFromStr(text));
                 }
                 else
                 {
@@ -6225,8 +6217,8 @@ struct pdf_annot_s
                                 PDF_NAME(Size), NULL);
             if (o) size = pdf_to_int(gctx, o);
 
-            DICT_SETITEM_DROP(res, dictkey_filename, JM_UNICODE(filename));
-            DICT_SETITEM_DROP(res, dictkey_desc, JM_UNICODE(desc));
+            DICT_SETITEM_DROP(res, dictkey_filename, JM_EscapeStrFromStr(filename));
+            DICT_SETITEM_DROP(res, dictkey_desc, JM_UnicodeFromStr(desc));
             DICT_SETITEM_DROP(res, dictkey_length, Py_BuildValue("i", length));
             DICT_SETITEM_DROP(res, dictkey_size, Py_BuildValue("i", size));
             return res;
@@ -6344,23 +6336,23 @@ CheckParent(self)
             pdf_obj *o;
 
             DICT_SETITEM_DROP(res, dictkey_content,
-                          Py_BuildValue("s", pdf_annot_contents(gctx, $self)));
+                          JM_UnicodeFromStr(pdf_annot_contents(gctx, $self)));
 
             o = pdf_dict_get(gctx, $self->obj, PDF_NAME(Name));
-            DICT_SETITEM_DROP(res, dictkey_name, Py_BuildValue("s", pdf_to_name(gctx, o)));
+            DICT_SETITEM_DROP(res, dictkey_name, JM_UnicodeFromStr(pdf_to_name(gctx, o)));
 
             // Title (= author)
             o = pdf_dict_get(gctx, $self->obj, PDF_NAME(T));
-            DICT_SETITEM_DROP(res, dictkey_title, Py_BuildValue("s", pdf_to_text_string(gctx, o)));
+            DICT_SETITEM_DROP(res, dictkey_title, JM_UnicodeFromStr(pdf_to_text_string(gctx, o)));
 
             // CreationDate
             o = pdf_dict_gets(gctx, $self->obj, "CreationDate");
             DICT_SETITEM_DROP(res, dictkey_creationDate,
-                          Py_BuildValue("s", pdf_to_text_string(gctx, o)));
+                          JM_UnicodeFromStr(pdf_to_text_string(gctx, o)));
 
             // ModDate
             o = pdf_dict_get(gctx, $self->obj, PDF_NAME(M));
-            DICT_SETITEM_DROP(res, dictkey_modDate, Py_BuildValue("s", pdf_to_text_string(gctx, o)));
+            DICT_SETITEM_DROP(res, dictkey_modDate, JM_UnicodeFromStr(pdf_to_text_string(gctx, o)));
 
             // Subj
             o = pdf_dict_gets(gctx, $self->obj, "Subj");
@@ -6370,7 +6362,7 @@ CheckParent(self)
             // Identification (PDF key /NM)
             o = pdf_dict_gets(gctx, $self->obj, "NM");
             DICT_SETITEM_DROP(res, dictkey_id,
-                          Py_BuildValue("s", pdf_to_text_string(gctx, o)));
+                          JM_UnicodeFromStr(pdf_to_text_string(gctx, o)));
 
             return res;
         }
@@ -6700,16 +6692,9 @@ struct fz_link_s
         %}
         PARENTCHECK(uri)
         %pythoncode %{@property%}
-        %pythonappend uri %{
-        if not val:
-            val = ""
-        else:
-            nval = "".join([c for c in val if 32 <= ord(c) <= 127])
-            val = nval
-        %}
         PyObject *uri()
         {
-            return JM_UNICODE($self->uri);
+            return JM_UnicodeFromStr($self->uri);
         }
 
         PARENTCHECK(isExternal)
@@ -7313,12 +7298,12 @@ struct Tools
         }
 
 
-        %feature("autodoc","Show anti-aliasing values.") anti_aliasing_values;
-        %pythonappend anti_aliasing_values %{
+        %feature("autodoc","Show anti-aliasing values.") show_aa_level;
+        %pythonappend show_aa_level %{
         d = {"graphics": val[0], "text": val[1], "graphics_min_line_width": val[2]}
         val = d
         %}
-        PyObject *anti_aliasing_values()
+        PyObject *show_aa_level()
         {
             return Py_BuildValue("iif",
                 fz_graphics_aa_level(gctx),

fitz/helper-annot.i

@@ -145,10 +145,10 @@ PyObject *JM_annot_border(fz_context *ctx, pdf_obj *annot_obj)
     }
 
     LIST_APPEND_DROP(effect_py, Py_BuildValue("i", effect1));
-    LIST_APPEND_DROP(effect_py, PyUnicode_FromString(effect2));
+    LIST_APPEND_DROP(effect_py, Py_BuildValue("s", effect2));
     DICT_SETITEM_DROP(res, dictkey_width, Py_BuildValue("f", width));
     DICT_SETITEM_DROP(res, dictkey_dashes, dash_py);
-    DICT_SETITEM_DROP(res, dictkey_style, PyUnicode_FromString(style));
+    DICT_SETITEM_DROP(res, dictkey_style, Py_BuildValue("s", style));
     if (effect1 > -1) PyDict_SetItem(res, dictkey_effect, effect_py);
     Py_CLEAR(effect_py);
     return res;
@@ -345,7 +345,7 @@ PyObject *JM_get_annot_id_list(fz_context *ctx, pdf_page *page)
             o = pdf_dict_gets(ctx, annot->obj, "NM");
             if (o)
             {
-                LIST_APPEND_DROP(names, PyUnicode_FromString(pdf_to_text_string(gctx, o)));
+                LIST_APPEND_DROP(names, Py_BuildValue("s", pdf_to_text_string(gctx, o)));
             }
         }
         //for (annotptr = &page->widgets; *annotptr; annotptr = &(*annotptr)->next)
@@ -354,7 +354,7 @@ PyObject *JM_get_annot_id_list(fz_context *ctx, pdf_page *page)
         //    o = pdf_dict_gets(ctx, annot->obj, "NM");
         //    if (o)
         //    {
-        //        LIST_APPEND_DROP(names, PyUnicode_FromString(pdf_to_text_string(gctx, o)));
+        //        LIST_APPEND_DROP(names, Py_BuildValue("s", pdf_to_text_string(gctx, o)));
         //    }
         //}
     }

fitz/helper-other.i

@@ -38,6 +38,18 @@ PyObject *JM_EscapeStrFromBuffer(fz_context *ctx, fz_buffer *buff)
     return val;
 }
 
+PyObject *JM_UnicodeFromStr(const char *c)
+{
+    if (!c) return PyUnicode_FromString("");
+    PyObject *val = Py_BuildValue("s", c);
+    if (!val)
+    {
+        val = PyUnicode_FromString("");
+        PyErr_Clear();
+    }
+    return val;
+}
+
 PyObject *JM_EscapeStrFromStr(const char *c)
 {
     if (!c) return PyUnicode_FromString("");

fitz/helper-pdfinfo.i

@@ -39,11 +39,11 @@ void JM_gather_fonts(fz_context *ctx, pdf_document *pdf, pdf_obj *dict,
         if (xref) ext = fontextension(ctx, pdf, xref);
         PyObject *entry = PyTuple_New(7);
         PyTuple_SET_ITEM(entry, 0, Py_BuildValue("i", xref));
-        PyTuple_SET_ITEM(entry, 1, PyUnicode_FromString(ext));
-        PyTuple_SET_ITEM(entry, 2, PyUnicode_FromString(pdf_to_name(ctx, subtype)));
-        PyTuple_SET_ITEM(entry, 3, JM_UNICODE(pdf_to_name(ctx, name)));
-        PyTuple_SET_ITEM(entry, 4, PyUnicode_FromString(pdf_to_name(ctx, refname)));
-        PyTuple_SET_ITEM(entry, 5, PyUnicode_FromString(pdf_to_name(ctx, encoding)));
+        PyTuple_SET_ITEM(entry, 1, Py_BuildValue("s", ext));
+        PyTuple_SET_ITEM(entry, 2, Py_BuildValue("s", pdf_to_name(ctx, subtype)));
+        PyTuple_SET_ITEM(entry, 3, JM_EscapeStrFromStr(pdf_to_name(ctx, name)));
+        PyTuple_SET_ITEM(entry, 4, Py_BuildValue("s", pdf_to_name(ctx, refname)));
+        PyTuple_SET_ITEM(entry, 5, Py_BuildValue("s", pdf_to_name(ctx, encoding)));
         PyTuple_SET_ITEM(entry, 6, Py_BuildValue("i", stream_xref));
         LIST_APPEND_DROP(fontlist, entry);
     }
@@ -176,7 +176,7 @@ void JM_gather_forms(fz_context *ctx, pdf_document *doc, pdf_obj *dict,
 
         PyObject *entry = PyTuple_New(4);
         PyTuple_SET_ITEM(entry, 0, Py_BuildValue("i", xref));
-        PyTuple_SET_ITEM(entry, 1, PyUnicode_FromString(pdf_to_name(ctx, refname)));
+        PyTuple_SET_ITEM(entry, 1, Py_BuildValue("s", pdf_to_name(ctx, refname)));
         PyTuple_SET_ITEM(entry, 2, Py_BuildValue("i", stream_xref));
         PyTuple_SET_ITEM(entry, 3, Py_BuildValue("ffff",
                                    bbox.x0, bbox.y0, bbox.x1, bbox.y1));