Skip to content

Jules - improve wrapping of -ve page numbers #5248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julian-smith-artifex-com merged 2 commits into from
Nov 3, 2026
+43 −26
Merged

Jules - improve wrapping of -ve page numbers #5248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e72342e
src/__init__.py tests/test_pagedelete.py: fix -ve handling in Documen…
julian-smith-artifex-com Nov 3, 2026
b763aec
src/__init__.py: use % to convert -ve into 0..page_count-1, instead o…
julian-smith-artifex-com Nov 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions src/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2881,12 +2881,12 @@ def __delitem__(self, i)->None:
start = i.start if i.start else 0
stop = i.stop if i.stop else pc
step = i.step if i.step else 1
while start < 0:
start += pc
if start < 0:
start %= pc
if start >= pc:
raise ValueError("bad page number(s)")
while stop < 0:
stop += pc
if stop < 0:
stop %= pc
if stop > pc:
raise ValueError("bad page number(s)")
return self.delete_pages(range(start, stop, step))
Expand Down Expand Up @@ -4429,10 +4429,10 @@ def delete_pages(self, *args, **kw):
raise ValueError("cannot mix keyword and positional argument")
f = kw.get("from_page", -1) # first page to delete
t = kw.get("to_page", -1) # last page to delete
while f < 0:
f += page_count
while t < 0:
t += page_count
if f < 0:
f %= page_count
if t < 0:
t %= page_count
if not f <= t < page_count:
raise ValueError("bad page number(s)")
numbers = tuple(range(f, t + 1))
Expand All @@ -4443,15 +4443,20 @@ def delete_pages(self, *args, **kw):
f, t = args
if not (type(f) is int and type(t) is int):
raise ValueError("both arguments must be int")
# Wrap -ve f and t into range 0..page_count-1.
if f < 0:
f %= page_count
if t < 0:
t %= page_count
if f > t:
f, t = t, f
if not f <= t < page_count:
raise ValueError("bad page number(s)")
numbers = tuple(range(f, t + 1))
elif isinstance(args[0], int):
pno = args[0]
while pno < 0:
pno += page_count
if pno < 0:
pno %= page_count
numbers = (pno,)
else:
numbers = tuple(args[0])
Expand Down Expand Up @@ -5834,8 +5839,8 @@ def load_page(self, page_id):
raise ValueError("page not in document")
if type(page_id) is int and page_id < 0:
np = self.page_count
while page_id < 0:
page_id += np
if page_id < 0:
page_id %= np
if isinstance(page_id, int):
page = mupdf.fz_load_page(self.this, page_id)
else:
Expand All @@ -5857,8 +5862,8 @@ def location_from_page_number(self, pno):
this_doc = self.this
loc = mupdf.fz_make_location(-1, -1)
page_count = mupdf.fz_count_pages(this_doc)
while pno < 0:
pno += page_count
if pno < 0:
pno %= page_count
if pno >= page_count:
raise ValueError( MSG_BAD_PAGENO)
loc = mupdf.fz_location_from_page_number(this_doc, pno)
Expand Down Expand Up @@ -6008,8 +6013,8 @@ def page_annot_xrefs(self, n):
else:
page_count = mupdf.fz_count_pages(self.this)
pdf_document = _as_pdf_document(self)
while n < 0:
n += page_count
if n < 0:
n %= page_count
if n > page_count:
raise ValueError( MSG_BAD_PAGENO)
page_obj = mupdf.pdf_lookup_page_obj(pdf_document, n)
Expand All @@ -6035,8 +6040,8 @@ def page_cropbox(self, pno):
this_doc = self.this
page_count = mupdf.fz_count_pages( this_doc)
n = pno
while n < 0:
n += page_count
if n < 0:
n %= page_count
pdf = _as_pdf_document(self)
if n >= page_count:
raise ValueError( MSG_BAD_PAGENO)
Expand All @@ -6052,8 +6057,8 @@ def page_number_from_location(self, page_id):
"""Convert (chapter, pno) to page number."""
if type(page_id) is int:
np = self.page_count
while page_id < 0:
page_id += np
if page_id < 0:
page_id %= np
page_id = (0, page_id)
if page_id not in self:
raise ValueError("page id not in document")
Expand All @@ -6070,8 +6075,8 @@ def page_xref(self, pno):
raise ValueError("document closed")
page_count = mupdf.fz_count_pages(self.this)
n = pno
while n < 0:
n += page_count
if n < 0:
n %= page_count
pdf = _as_pdf_document(self)
xref = 0
if n >= page_count:
Expand Down Expand Up @@ -6116,8 +6121,8 @@ def pages(self, start: OptInt =None, stop: OptInt =None, step: OptInt =None) ->
return
# set the start value
start = start or 0
while start < 0:
start += self.page_count
if start < 0:
start %= self.page_count
if start not in range(self.page_count):
raise ValueError("bad start page number")

Expand Down Expand Up @@ -13758,8 +13763,8 @@ def show_pdf_page(
if rect.is_empty or rect.is_infinite:
raise ValueError("rect must be finite and not empty")

while pno < 0: # support negative page numbers
pno += docsrc.page_count
if pno < 0: # support negative page numbers
pno %= docsrc.page_count
src_page = docsrc[pno] # load source page

tar_rect = rect * ~page.transformation_matrix # target rect in PDF coordinates
Expand Down
12 changes: 12 additions & 0 deletions tests/test_pagedelete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,15 @@ def test_4790():
# Expect correct result.
assert len(document) == 1, f'{len(document)=}'


def test_5240():
def make_document():
document = pymupdf.open()
n = 5
for _ in range(n):
document.new_page()
return document
document = make_document()
document.delete_pages(from_page=-2, to_page=-1)
document = make_document()
document.delete_pages(-2, -1)
Loading