Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup previous PR

Browse Source
This commit is contained in:
Kovid Goyal 2024-10-26 20:36:33 +05:30
parent d3ef2855d9
commit 38b2f2da5c
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/ebooks/pdf/reflow.py
View File

@ -184,15 +184,16 @@ class Text(Element):
@property @property
def is_empty(self): def is_empty(self):
# There is nothing in this Text # There is nothing in this Text
return len(self.raw) == 0 return not self.raw
@property @property
def is_spaces(self): def is_spaces(self):
# There are only spaces in this Text # There are only spaces in this Text
return len(self.raw) > 0 \ return bool(self.raw) and (
and (re.match('^\s+$', self.raw) is not None \ re.match(r'^\s+$', self.raw) is not None or
or re.match('^\s*<i>\s*</i>\s*$', self.raw) is not None \ re.match(r'^\s*<i>\s*</i>\s*$', self.raw) is not None or
or re.match('^\s*<b>\s*</b>\s*$', self.raw) is not None) re.match(r'^\s*<b>\s*</b>\s*$', self.raw) is not None
)
def coalesce(self, other, page_number, left_margin, right_margin): def coalesce(self, other, page_number, left_margin, right_margin):
if self.opts.verbose > 2: if self.opts.verbose > 2:
@ -283,7 +284,7 @@ class Text(Element):
# Float right if the text ends around the right margin, # Float right if the text ends around the right margin,
# and there are no long groups of spaces earlier in the line # and there are no long groups of spaces earlier in the line
# as that probably means justified text. # as that probably means justified text.
if not ' ' in self.text_as_string \ if ' ' not in self.text_as_string \
and other.right > right_margin - right_margin * RIGHT_FLOAT_FACTOR: and other.right > right_margin - right_margin * RIGHT_FLOAT_FACTOR:
has_float = '<span style="float:right">' has_float = '<span style="float:right">'
has_gap = 1 has_gap = 1
@ -334,10 +335,10 @@ class Text(Element):
#elif sub_super > 0: #elif sub_super > 0:
# other.raw = '<sub>' + other.raw + '</sub>' # other.raw = '<sub>' + other.raw + '</sub>'
if len(has_float): if has_float:
self.raw += has_float self.raw += has_float
self.raw += other.raw self.raw += other.raw
if len(has_float): if has_float:
self.raw += '</span>' self.raw += '</span>'
self.average_character_width = self.width/len(self.text_as_string) self.average_character_width = self.width/len(self.text_as_string)
#self.last_left = other.left #self.last_left = other.left