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

PDF Output: Fix a regression in 2.83 that caused occasional blank pages at the end of chapters when using headers/footers. Fixes #1706484 [epub to pdf extra blank pages](https://bugs.launchpad.net/calibre/+bug/1706484)

Browse Source
This commit is contained in:
Kovid Goyal 2017-07-26 18:11:42 +05:30
parent 6c63430bec
commit 8abd3b3c01
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/ebooks/pdf/render/engine.py
View File

@ -63,7 +63,7 @@ class PdfEngine(QPaintEngine):
def __init__(self, file_object, page_width, page_height, left_margin, def __init__(self, file_object, page_width, page_height, left_margin,
top_margin, right_margin, bottom_margin, width, height, top_margin, right_margin, bottom_margin, width, height,
errors=print, debug=print, compress=True, errors=print, debug=print, compress=True,
mark_links=False, opts=None): mark_links=False, opts=None, page_margins=(0, 0, 0, 0)):
QPaintEngine.__init__(self, self.FEATURES) QPaintEngine.__init__(self, self.FEATURES)
self.file_object = file_object self.file_object = file_object
self.compress, self.mark_links = compress, mark_links self.compress, self.mark_links = compress, mark_links
@ -95,8 +95,9 @@ class PdfEngine(QPaintEngine):
self.qt_hack, err = plugins['qt_hack'] self.qt_hack, err = plugins['qt_hack']
self.has_footers = opts is not None and (opts.pdf_page_numbers or opts.pdf_footer_template is not None) self.has_footers = opts is not None and (opts.pdf_page_numbers or opts.pdf_footer_template is not None)
self.has_headers = opts is not None and opts.pdf_header_template is not None self.has_headers = opts is not None and opts.pdf_header_template is not None
self.header_height = (opts.margin_top or 0) if opts else 0 ml, mr, mt, mb = page_margins
self.footer_height = (opts.margin_bottom) or 0 if opts else 0 self.header_height = mt
self.footer_height = mb
if err: if err:
raise RuntimeError('Failed to load qt_hack with err: %s'%err) raise RuntimeError('Failed to load qt_hack with err: %s'%err)
@ -347,7 +348,7 @@ class PdfDevice(QPaintDevice): # {{{
def __init__(self, file_object, page_size=A4, left_margin=inch, def __init__(self, file_object, page_size=A4, left_margin=inch,
top_margin=inch, right_margin=inch, bottom_margin=inch, top_margin=inch, right_margin=inch, bottom_margin=inch,
xdpi=1200, ydpi=1200, errors=print, debug=print, xdpi=1200, ydpi=1200, errors=print, debug=print,
compress=True, mark_links=False, opts=None): compress=True, mark_links=False, opts=None, page_margins=(0, 0, 0, 0)):
QPaintDevice.__init__(self) QPaintDevice.__init__(self)
self.xdpi, self.ydpi = xdpi, ydpi self.xdpi, self.ydpi = xdpi, ydpi
self.page_width, self.page_height = page_size self.page_width, self.page_height = page_size
@ -359,7 +360,7 @@ class PdfDevice(QPaintDevice): # {{{
left_margin, top_margin, right_margin, left_margin, top_margin, right_margin,
bottom_margin, self.width(), self.height(), bottom_margin, self.width(), self.height(),
errors=errors, debug=debug, compress=compress, errors=errors, debug=debug, compress=compress,
mark_links=mark_links, opts=opts) mark_links=mark_links, opts=opts, page_margins=page_margins)
self.add_outline = self.engine.add_outline self.add_outline = self.engine.add_outline
self.add_links = self.engine.add_links self.add_links = self.engine.add_links

2
src/calibre/ebooks/pdf/render/from_html.py
View File

@ -189,7 +189,7 @@ class PDFWriter(QObject):
xdpi=xdpi, ydpi=ydpi, errors=self.log.error, xdpi=xdpi, ydpi=ydpi, errors=self.log.error,
debug=self.log.debug, compress=not debug=self.log.debug, compress=not
opts.uncompressed_pdf, opts=opts, opts.uncompressed_pdf, opts=opts,
mark_links=opts.pdf_mark_links) mark_links=opts.pdf_mark_links, page_margins=(ml, mr, mt, mb))
self.footer = opts.pdf_footer_template self.footer = opts.pdf_footer_template
if self.footer: if self.footer:
self.footer = self.footer.strip() self.footer = self.footer.strip()