@@ -6784,12 +6784,9 @@ def select(self, pyliste):
67846784 pdf = _as_pdf_document(self)
67856785 # create page sub-pdf via pdf_rearrange_pages2().
67866786 #
6787- if mupdf_version_tuple >= (1, 25, 3):
6788- # We use PDF_CLEAN_STRUCTURE_KEEP otherwise we lose structure tree
6789- # which, for example, breaks test_3705.
6790- mupdf.pdf_rearrange_pages2(pdf, pyliste, mupdf.PDF_CLEAN_STRUCTURE_KEEP)
6791- else:
6792- mupdf.pdf_rearrange_pages2(pdf, pyliste)
6787+ # We use PDF_CLEAN_STRUCTURE_KEEP otherwise we lose structure tree
6788+ # which, for example, breaks test_3705.
6789+ mupdf.pdf_rearrange_pages2(pdf, pyliste, mupdf.PDF_CLEAN_STRUCTURE_KEEP)
67936790
67946791 # remove any existing pages with their kids
67956792 self._reset_page_refs()
@@ -17601,14 +17598,13 @@ def width(self):
1760117598if mupdf_version_tuple >= (1, 27, 1):
1760217599 TEXT_LAZY_VECTORS = mupdf.FZ_STEXT_LAZY_VECTORS
1760317600
17604- if mupdf_version_tuple >= (1, 26):
17605- TEXT_PARAGRAPH_BREAK = mupdf.FZ_STEXT_PARAGRAPH_BREAK
17606- TEXT_TABLE_HUNT = mupdf.FZ_STEXT_TABLE_HUNT
17607- TEXT_COLLECT_STYLES = mupdf.FZ_STEXT_COLLECT_STYLES
17608- TEXT_USE_GID_FOR_UNKNOWN_UNICODE = mupdf.FZ_STEXT_USE_GID_FOR_UNKNOWN_UNICODE
17609- TEXT_CLIP_RECT = mupdf.FZ_STEXT_CLIP_RECT
17610- TEXT_ACCURATE_ASCENDERS = mupdf.FZ_STEXT_ACCURATE_ASCENDERS
17611- TEXT_ACCURATE_SIDE_BEARINGS = mupdf.FZ_STEXT_ACCURATE_SIDE_BEARINGS
17601+ TEXT_PARAGRAPH_BREAK = mupdf.FZ_STEXT_PARAGRAPH_BREAK
17602+ TEXT_TABLE_HUNT = mupdf.FZ_STEXT_TABLE_HUNT
17603+ TEXT_COLLECT_STYLES = mupdf.FZ_STEXT_COLLECT_STYLES
17604+ TEXT_USE_GID_FOR_UNKNOWN_UNICODE = mupdf.FZ_STEXT_USE_GID_FOR_UNKNOWN_UNICODE
17605+ TEXT_CLIP_RECT = mupdf.FZ_STEXT_CLIP_RECT
17606+ TEXT_ACCURATE_ASCENDERS = mupdf.FZ_STEXT_ACCURATE_ASCENDERS
17607+ TEXT_ACCURATE_SIDE_BEARINGS = mupdf.FZ_STEXT_ACCURATE_SIDE_BEARINGS
1761217608
1761317609# 2025-05-07: Non-standard names preserved for backwards compatibility.
1761417610TEXT_STEXT_SEGMENT = TEXT_SEGMENT
@@ -20533,8 +20529,7 @@ def __init__(self, rhs=None):
2053320529 if rhs:
2053420530 self.size = rhs.size
2053520531 self.flags = rhs.flags
20536- if mupdf_version_tuple >= (1, 25, 2):
20537- self.char_flags = rhs.char_flags
20532+ self.char_flags = rhs.char_flags
2053820533 self.font = rhs.font
2053920534 self.argb = rhs.argb
2054020535 self.asc = rhs.asc
@@ -20543,17 +20538,15 @@ def __init__(self, rhs=None):
2054320538 else:
2054420539 self.size = -1
2054520540 self.flags = -1
20546- if mupdf_version_tuple >= (1, 25, 2):
20547- self.char_flags = -1
20541+ self.char_flags = -1
2054820542 self.font = ''
2054920543 self.argb = -1
2055020544 self.asc = 0
2055120545 self.desc = 0
2055220546 self.bidi = 0
2055320547 def __str__(self):
2055420548 ret = f'{self.size} {self.flags}'
20555- if mupdf_version_tuple >= (1, 25, 2):
20556- ret += f' {self.char_flags}'
20549+ ret += f' {self.char_flags}'
2055720550 ret += f' {self.font} {self.color} {self.asc} {self.desc}'
2055820551 return ret
2055920552
@@ -20581,9 +20574,8 @@ def __str__(self):
2058120574 origin = mupdf.FzPoint(ch.m_internal.origin)
2058220575 style.size = ch.m_internal.size
2058320576 style.flags = flags
20584- if mupdf_version_tuple >= (1, 25, 2):
20585- # FZ_STEXT_SYNTHETIC is per-char, not per-span.
20586- style.char_flags = ch.m_internal.flags & ~mupdf.FZ_STEXT_SYNTHETIC
20577+ # FZ_STEXT_SYNTHETIC is per-char, not per-span.
20578+ style.char_flags = ch.m_internal.flags & ~mupdf.FZ_STEXT_SYNTHETIC
2058720579 style.font = JM_font_name(mupdf.FzFont(mupdf.ll_fz_keep_font(ch.m_internal.font)))
2058820580 style.argb = ch.m_internal.argb
2058920581 style.asc = JM_font_ascender(mupdf.FzFont(mupdf.ll_fz_keep_font(ch.m_internal.font)))
@@ -20592,9 +20584,7 @@ def __str__(self):
2059220584
2059320585 if (style.size != old_style.size
2059420586 or style.flags != old_style.flags
20595- or (mupdf_version_tuple >= (1, 25, 2)
20596- and (style.char_flags != old_style.char_flags)
20597- )
20587+ or (style.char_flags != old_style.char_flags)
2059820588 or style.argb != old_style.argb
2059920589 or style.font != old_style.font
2060020590 or style.bidi != old_style.bidi
@@ -20626,12 +20616,10 @@ def __str__(self):
2062620616 span[dictkey_size] = style.size
2062720617 span[dictkey_flags] = style.flags
2062820618 span[dictkey_bidi] = style.bidi
20629- if mupdf_version_tuple >= (1, 25, 2):
20630- span[dictkey_char_flags] = style.char_flags
20619+ span[dictkey_char_flags] = style.char_flags
2063120620 span[dictkey_font] = JM_EscapeStrFromStr(style.font)
2063220621 span[dictkey_color] = style.argb & 0xffffff
20633- if mupdf_version_tuple >= (1, 25, 0):
20634- span['alpha'] = style.argb >> 24
20622+ span['alpha'] = style.argb >> 24
2063520623 span["ascender"] = asc
2063620624 span["descender"] = desc
2063720625
0 commit comments