...

src/calibre/ebooks/pdf/writer.py

@@ -40,14 +40,21 @@ def get_custom_size(opts):
                 custom_size = None
     return custom_size
 
-def get_pdf_printer(opts, for_comic=False):
+def get_pdf_printer(opts, for_comic=False, output_file_name=None):
     from calibre.gui2 import is_ok_to_use_qt
     if not is_ok_to_use_qt():
         raise Exception('Not OK to use Qt')
 
     printer = QPrinter(QPrinter.HighResolution)
     custom_size = get_custom_size(opts)
-
+    if isosx and not for_comic:
+        # On OSX, the native engine can only produce a single page size
+        # (usually A4). The Qt engine on the other hand produces image based
+        # PDFs. If we set a custom page size using QSizeF the native engine
+        # produces unreadable output, so we just ignore the custom size
+        # settings.
+        printer.setPaperSize(paper_size(opts.paper_size))
+    else:
         if opts.output_profile.short_name == 'default' or \
                 opts.output_profile.width > 9999:
             if custom_size is None:
@@ -72,6 +79,12 @@ def get_pdf_printer(opts, for_comic=False):
     printer.setOrientation(orientation(opts.orientation))
     printer.setOutputFormat(QPrinter.PdfFormat)
     printer.setFullPage(for_comic)
+    if output_file_name:
+        printer.setOutputFileName(output_file_name)
+    if isosx and not for_comic:
+        # Ensure we are not generating enormous image based PDFs
+        printer.setOutputFormat(QPrinter.NativeFormat)
+
     return printer
 
 def get_printer_page_size(opts, for_comic=False):
@@ -163,15 +176,7 @@ class PDFWriter(QObject): # {{{
         if ok:
             item_path = os.path.join(self.tmp_path, '%i.pdf' % len(self.combine_queue))
             self.logger.debug('\tRendering item %s as %i.pdf' % (os.path.basename(str(self.view.url().toLocalFile())), len(self.combine_queue)))
-            printer = get_pdf_printer(self.opts)
+            printer = get_pdf_printer(self.opts, output_file_name=item_path)
-            printer.setOutputFileName(item_path)
-            # We have to set the engine to Native on OS X after the call to set
-            # filename. Setting a filename with .pdf as the extension causes
-            # Qt to set the format to use Qt's PDF engine even if native was
-            # previously set on the printer. Qt's PDF engine produces image
-            # based PDFs on OS X, so we cannot use it.
-            if isosx:
-                printer.setOutputFormat(QPrinter.NativeFormat)
             self.view.page().mainFrame().evaluateJavaScript('''
                 document.body.style.backgroundColor = "white";
 
@@ -193,10 +198,7 @@ class PDFWriter(QObject): # {{{
         if self.cover_data is None:
             return
         item_path = os.path.join(self.tmp_path, 'cover.pdf')
-        printer = get_pdf_printer(self.opts)
+        printer = get_pdf_printer(self.opts, output_file_name=item_path)
-        printer.setOutputFileName(item_path)
-        if isosx:
-            printer.setOutputFormat(QPrinter.NativeFormat)
         self.combine_queue.insert(0, item_path)
         p = QPixmap()
         p.loadFromData(self.cover_data)
@@ -248,10 +250,8 @@ class ImagePDFWriter(object):
             os.remove(f.name)
 
     def render_images(self, outpath, mi, items):
-        printer = get_pdf_printer(self.opts, for_comic=True)
+        printer = get_pdf_printer(self.opts, for_comic=True,
-        printer.setOutputFileName(outpath)
+                output_file_name=outpath)
-        if isosx:
-            printer.setOutputFormat(QPrinter.NativeFormat)
         printer.setDocName(mi.title)
         printer.setCreator(u'%s [%s]'%(__appname__, __version__))
         # Seems to be no way to set author