first changes for v1.18.7

Author: JorjMcKie

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: PyMuPDF
-Version: 1.18.6
+Version: 1.18.7
 Author: Jorj McKie
 Author-email: [email protected]
 Maintainer: Jorj 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: January 7, 2021
+        Release date: January 15, 2021
 
         Authors
         =======
@@ -20,7 +20,7 @@ Description:
         Introduction
         ============
 
-        This is **version 1.18.6 of PyMuPDF**, a Python binding for `MuPDF <http://mupdf.com/>`_ - "a lightweight PDF and XPS viewer".
+        This is **version 1.18.7 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.18.6
+# PyMuPDF 1.18.7
 
 ![logo](https://github.com/pymupdf/PyMuPDF/blob/master/demo/pymupdf.jpg)
 
@@ -15,7 +15,7 @@ On **[PyPI](https://pypi.org/project/PyMuPDF)** since August 2016: [![](https://
 
 # Introduction
 
-This is **version 1.18.6 of PyMuPDF**, a Python binding with support for [MuPDF 1.18.*](http://mupdf.com/) - "a lightweight PDF, XPS, and E-book viewer".
+This is **version 1.18.7 of PyMuPDF**, a Python binding with support for [MuPDF 1.18.*](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.
 

fitz/__init__.py

@@ -56,6 +56,8 @@
 fitz.Document.tobytes = fitz.Document.write
 fitz.Document.set_page_labels = fitz.utils.set_page_labels
 fitz.Document.get_page_numbers = fitz.utils.get_page_numbers
+fitz.Document.has_links = fitz.utils.has_links
+fitz.Document.has_annots = fitz.utils.has_annots
 
 # ------------------------------------------------------------------------------
 # Page

fitz/fitz.i

@@ -2052,6 +2052,28 @@ if len(pyliste) == 0 or min(pyliste) not in range(len(self)) or max(pyliste) not
         }
 
 
+        FITZEXCEPTION(page_annot_xrefs, !result)
+        CLOSECHECK0(page_annot_xrefs, """Get list annotations of page number.""")
+        PyObject *page_annot_xrefs(int pno)
+        {
+            fz_document *this_doc = (fz_document *) $self;
+            int pageCount = fz_count_pages(gctx, this_doc);
+            int n = pno;
+            while (n < 0) n += pageCount;
+            pdf_document *pdf = pdf_specifics(gctx, this_doc);
+            PyObject *annots = NULL;
+            fz_try(gctx) {
+                if (n >= pageCount) THROWMSG(gctx, "bad page number(s)");
+                ASSERT_PDF(pdf);
+                annots = JM_get_annot_xref_list(gctx, pdf_lookup_page_obj(gctx, pdf, n));
+            }
+            fz_catch(gctx) {
+                return NULL;
+            }
+            return annots;
+        }
+
+
         FITZEXCEPTION(pageCropBox, !result)
         CLOSECHECK0(pageCropBox, """Get CropBox of page number (without loading page).""")
         %pythonappend pageCropBox %{val = Rect(val)%}
@@ -3801,8 +3823,7 @@ if basestate:
                 old_toc = self.getToC()
                 for i, item in enumerate(old_toc):
                     if item[2] == pno + 1:
-                        xref = self.outline_xref(i)
-                        self._remove_toc_item(xref)
+                        self.del_toc_item(i)
 
                 self._remove_links_to(pno, pno)
                 self._deletePage(pno)
@@ -3831,8 +3852,7 @@ if basestate:
                 old_toc = self.getToC()
                 for i, item in enumerate(old_toc):
                     if f + 1 <= item[2] <= t + 1:
-                        xref = self.outline_xref(i)
-                        self._remove_toc_item(xref)
+                        self.del_toc_item(i)
 
                 self._remove_links_to(f, t)
 
@@ -5078,7 +5098,7 @@ def get_oc_items(self) -> list:
         {
             pdf_page *page = pdf_page_from_fz_page(gctx, (fz_page *) $self);
             if (!page) Py_RETURN_NONE;
-            return JM_get_annot_xref_list(gctx, page);
+            return JM_get_annot_xref_list(gctx, page->obj);
         }
 
 

fitz/helper-annot.i

@@ -321,11 +321,11 @@ PyObject *JM_get_annot_id_list(fz_context *ctx, pdf_page *page)
 //------------------------------------------------------------------------
 // return the xrefs and /NM ids of a page's annots, links and fields
 //------------------------------------------------------------------------
-PyObject *JM_get_annot_xref_list(fz_context *ctx, pdf_page *page)
+PyObject *JM_get_annot_xref_list(fz_context *ctx, pdf_obj *page_obj)
 {
     PyObject *names = PyList_New(0);
     pdf_obj *id, *annot_obj = NULL;
-    pdf_obj *annots = pdf_dict_get(ctx, page->obj, PDF_NAME(Annots));
+    pdf_obj *annots = pdf_dict_get(ctx, page_obj, PDF_NAME(Annots));
     if (!annots) return names;
     fz_try(ctx) {
         int i, n = pdf_array_len(ctx, annots);

fitz/utils.py

@@ -170,7 +170,9 @@ def calc_matrix(sr, tr, keep=True, rotate=0):
     matrix = calc_matrix(src_rect, tar_rect, keep=keep_proportion, rotate=rotate)
 
     # list of existing /Form /XObjects
-    ilst = [i[1] for i in doc._getPageInfo(page.number, 3)]
+    ilst = [i[1] for i in doc.get_page_xobjects(page.number)]
+    ilst += [i[7] for i in doc.get_page_images(page.number)]
+    ilst += [i[4] for i in doc.get_page_fonts(page.number)]
 
     # create a name not in that list
     n = "fzFrm"
@@ -369,8 +371,10 @@ def calc_matrix(fw, fh, tr, rotate=0):
     matrix = calc_matrix(fw, fh, clip, rotate=rotate)  # calculate matrix
 
     # Create a unique image reference name.
-    ilst = [i[7] for i in doc.getPageImageList(page.number)]
-    n = "Im"  # 'fitz image'
+    ilst = [i[7] for i in doc.get_page_images(page.number)]
+    ilst += [i[1] for i in doc.get_page_xobjects(page.number)]
+    ilst += [i[4] for i in doc.get_page_fonts(page.number)]
+    n = "fzImg"  # 'fitz image'
     i = 0
     _imgname = n + "0"  # first name candidate
     while _imgname in ilst:
@@ -1068,10 +1072,10 @@ def setToC(
     # make a list of xref numbers, which we can use for our TOC entries
     # --------------------------------------------------------------------------
     old_xrefs = doc._delToC()  # del old outlines, get their xref numbers
-    old_xrefs = []  # TODO do not reuse them currently
+
     # prepare table of xrefs for new bookmarks
     xref = [0] + old_xrefs
-    xref[0] = doc._getOLRootNumber()  # entry zero is outline root xref#
+    xref[0] = doc._getOLRootNumber()  # entry zero is outline root xref number
     if toclen > len(old_xrefs):  # too few old xrefs?
         for i in range((toclen - len(old_xrefs))):
             xref.append(doc.get_new_xref())  # acquire new ones
@@ -4466,3 +4470,37 @@ def create_nums(labels):
 
 
 # End of Page Label Code -------------------------------------------------
+
+
+def has_links(doc: Document) -> bool:
+    """Check whether there links on any page."""
+    if doc.isClosed:
+        raise ValueError("closed document")
+    if not doc.isPDF:
+        raise ValueError("not a PDF")
+    s = set()
+    for i in range(doc.pageCount):
+        s = s.union([True for j in doc.page_annot_xrefs(i) if j[1] == PDF_ANNOT_LINK])
+        if s == {True}:
+            return True
+    return False
+
+
+def has_annots(doc: Document) -> bool:
+    """Check whether there annotations on any page."""
+    if doc.isClosed:
+        raise ValueError("closed document")
+    if not doc.isPDF:
+        raise ValueError("not a PDF")
+    s = set()
+    for i in range(doc.pageCount):
+        s = s.union(
+            [
+                True
+                for j in doc.page_annot_xrefs(i)
+                if j[1] not in (PDF_ANNOT_LINK, PDF_ANNOT_WIDGET)
+            ]
+        )
+        if s == {True}:
+            return True
+    return False

fitz/version.i

@@ -1,6 +1,6 @@
 %pythoncode %{
 VersionFitz = "1.18.0"
-VersionBind = "1.18.6"
-VersionDate = "2021-01-07 07:10:59"
-version = (VersionBind, VersionFitz, "20210107071059")
+VersionBind = "1.18.7"
+VersionDate = "2021-01-09 08:53:43"
+version = (VersionBind, VersionFitz, "20210109085343")
 %}

setup.py

@@ -131,7 +131,7 @@ def load_libraries():
 
 setup(
     name="PyMuPDF",
-    version="1.18.6",
+    version="1.18.7",
     description="Python bindings for the PDF rendering library MuPDF",
     long_description=long_desc,
     classifiers=classifier,