Merge lp:~user-none/calibre/dev into lp:calibre

[John Schember]

[lp:~user-none/calibre/dev]

11991. By Kovid Goyal on 2012-04-23

KF8: Fix handling of multi-level ToCs

11992. By Kovid Goyal on 2012-04-23

...

11993. By Kovid Goyal on 2012-04-23

Fix Der Tagesspiegel

11994. By Kovid Goyal on 2012-04-23

KF8 debug: Dump the guide

11995. By Kovid Goyal on 2012-04-23

KF8: Improved handling of startoffset

11996. By Kovid Goyal on 2012-04-23

Berria by Alayn Gortazar

11997. By Kovid Goyal on 2012-04-23

...

11998. By Kovid Goyal on 2012-04-23

...

11999. By Kovid Goyal on 2012-04-23

Show cover size in a tooltip in the conversion dialog

12000. By Kovid Goyal on 2012-04-23

Cover Browser: Wrap the title on space only, not in between words. Fixes #986516 (Cover Browser - font size, divided words)

12001. By Kovid Goyal on 2012-04-23

Fix #986958 (Tooltip not updating when paste cover)

12002. By Kovid Goyal on 2012-04-23

Fix #986658 (Calibre crashes when updating data on Metadata)

12003. By Kovid Goyal on 2012-04-23

tighten format_field_extended

12004. By Kovid Goyal on 2012-04-23

...

12005. By Kovid Goyal on 2012-04-23

...

12006. By Kovid Goyal on 2012-04-24

oops, remove the mistaken tightening of gotmat_field_extended

12007. By Kovid Goyal on 2012-04-24

...

12008. By Kovid Goyal on 2012-04-24

Nicer dump headers for joint KF8 files

12009. By Kovid Goyal on 2012-04-24

...

12010. By Kovid Goyal on 2012-04-24

KF8 Output: Implement joint mobi files with both MOBI 6 and KF8 versions in the same file

12011. By Kovid Goyal on 2012-04-24

Heuristics: When italicizing words do not operate on words not in between HTML tags. Fixes #986298 (Heuristics breaking id="_anchor_")

12012. By Kovid Goyal on 2012-04-24

...

12013. By Kovid Goyal on 2012-04-25

...

12014. By Kovid Goyal on 2012-04-25

KF8 Output: Fix length entries in the NCX table

12015. By Kovid Goyal on 2012-04-25

Fix #985353 (Updated Metro Nieuws NL)

12016. By Kovid Goyal on 2012-04-25

Updated Marketing Magazine

12017. By Kovid Goyal on 2012-04-25

Non legerlo and Vignetter by faber 1971

12018. By Kovid Goyal on 2012-04-26

Fix #985353 (Updated Metro Nieuws NL)

12019. By Kovid Goyal on 2012-04-26

KF8 Output: Generate trailing bytes for books with flat ToCs

12020. By Kovid Goyal on 2012-04-26

KF8 Input: Handle images referenced via CSS url in the style attribute of a tag

12021. By Kovid Goyal on 2012-04-26

Conversion pipeline: Fix handling of relative resource URLs in the CSS of the input document

12022. By Kovid Goyal on 2012-04-26

Switch to using cssutils 0.9.9 for improved performance and robustness

12023. By Kovid Goyal on 2012-04-26

...

12024. By Kovid Goyal on 2012-04-26

...

12025. By Kovid Goyal on 2012-04-26

...

12026. By Kovid Goyal on 2012-04-26

Fix #988956 (Calibre cant see Android Device after upgrade to Android 4.0.3)

12027. By Kovid Goyal on 2012-04-26

IGN:Updated translations

12028. By Kovid Goyal on 2012-04-26

KF8 Output: Split on page breaks to produce KF8 files that work better with viewers that dont support CSS page breaks. Also remove no longer used MOBI_UNPACK code from MOBI input

12029. By Kovid Goyal on 2012-04-26

...

12030. By Kovid Goyal on 2012-04-26

KF8 Output: Add an inline ToC if one is not already present in the input document

12031. By Kovid Goyal on 2012-04-26

...

12032. By Kovid Goyal on 2012-04-27

Fix #989264 (New Device: Nook Simple Touch w/ Glow Light)

12033. By Kovid Goyal on 2012-04-27

Richmond Times-Dispatch by jde

12034. By Kovid Goyal on 2012-04-27

version 0.8.49

12035. By Kovid Goyal on 2012-04-27

IGN:Tag release

12036. By Kovid Goyal on 2012-04-27

Fix #989691 (Book details Picture error)

12037. By Kovid Goyal on 2012-04-27

...

12038. By Kovid Goyal on 2012-04-27

FB2 Input: Better handling of inline images. Fixes #989869 (fb2: export/display: inline images displayed as top level)

12039. By Kovid Goyal on 2012-04-27

EPUB Input: Auto set the media-type for OPF manifest entries with an empty media-type

12040. By Kovid Goyal on 2012-04-27

Fix #989985 (updated tweakers.net recipe)

12041. By Kovid Goyal on 2012-04-28

Fix #990026 (fb2: lang tag uses wrong ISO)

12042. By Kovid Goyal on 2012-04-28

KF8 dump: Dump all TBS sequences

12043. By Kovid Goyal on 2012-04-28

Fix #990451 (Calibre 0.8.4x GUI not detecting Android Phone)

12044. By Kovid Goyal on 2012-04-28

...

12045. By Kovid Goyal on 2012-04-28

More informative error message for SplitErrors

12046. By Kovid Goyal on 2012-04-28

...

12047. By Kovid Goyal on 2012-04-28

KF8 Output: Proper algorithm for calculatin trailing bytes for all types of ToCs

12048. By Kovid Goyal on 2012-04-28

...

12049. By Kovid Goyal on 2012-04-28

Automatically add the Tag 'Sample Book' when an Amazon sample is added to calibre

12050. By Kovid Goyal on 2012-04-29

Improved derStandard

12051. By Kovid Goyal on 2012-04-29

AraInfo and Diagonal by Ruben Pollan

12052. By Kovid Goyal on 2012-04-29

Save to Disk: Do not run out memory when saving very large files on systems with low RAM. Fixes #990741 ("Out of memory" when saving to disk)

12053. By Kovid Goyal on 2012-04-29

Fix #990881 (Shift-click after using cover browser makes wrong selection)

12054. By Kovid Goyal on 2012-04-29

FB2 Input: More robust base64 decoding to handle embedded images that are incorrectly encoded. Fixes #990929 (Private bug)

12055. By Kovid Goyal on 2012-04-29

Conversion: Allow easy re-ordering of the search and replace expressions in the conversion dialog. Also apply the expressions in the same order that they were entered when doing the conversion.

12056. By Kovid Goyal on 2012-04-29

For the wankers among us. Fixes #991081 (contains copypasted description without copyright)

12057. By Kovid Goyal on 2012-04-29

Get Books: Amazon fix prices not being found. B&N fix details link. ebooks.com: fix cover image. Website changes to various EU stores

12058. By Kovid Goyal on 2012-04-29

Update Max-Planck

12059. By Kovid Goyal on 2012-04-30

Update Mig Pao

12060. By Kovid Goyal on 2012-04-30

KF8 Output: Handle documents that have XML comments and/or processing instructions

12061. By Kovid Goyal on 2012-04-30

Write metadata in .azw3 files

12062. By Kovid Goyal on 2012-04-30

...

12063. By Kovid Goyal on 2012-04-30

KF8 Output: Write useless FLIS/FCIS records as older kindles refuse to open joint MOBI files without them

12064. By Kovid Goyal on 2012-04-30

Add azw3 output plugin (thin wrapper around the standalone kf8 mobi output code)

12065. By Kovid Goyal on 2012-04-30

Update Newsweek Polska

12066. By Kovid Goyal on 2012-04-30

El Mundo Today by atordo

12067. By Kovid Goyal on 2012-05-01

Update Daily Mirrot and The Sun

12068. By Kovid Goyal on 2012-05-01

George Monbiot by DM

12069. By Kovid Goyal on 2012-05-01

...

12070. By Kovid Goyal on 2012-05-01

...

12071. By Kovid Goyal on 2012-05-01

Add calibre-debug --tweak-kf8 tool for tweaking kf8 books

12072. By Kovid Goyal on 2012-05-01

Command Line Interface for the Tweak Book feature

12073. By Kovid Goyal on 2012-05-01

Run explode/rebuild of MOBI in worker process to ensure no mem leaks

12074. By Kovid Goyal on 2012-05-02

...

12075. By Kovid Goyal on 2012-05-02

Vice Magazine by atordo

12076. By Kovid Goyal on 2012-05-02

Get Books: Add biblio.bg store

=== modified file 'src/calibre/ebooks/pdf/writer.py'
--- src/calibre/ebooks/pdf/writer.py	2012-03-31 05:15:51 +0000
+++ src/calibre/ebooks/pdf/writer.py	2012-04-23 01:01:23 +0000
@@ -45,29 +45,24 @@
     if not is_ok_to_use_qt():
         raise Exception('Not OK to use Qt')
 
+    custom_size = False
     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))
+    if opts.output_profile.short_name == 'default' or \
+            opts.output_profile.width > 9999:
+        if custom_size is None:
+            printer.setPaperSize(paper_size(opts.paper_size))
+        else:
+            custom_size = True
+            printer.setPaperSize(QSizeF(custom_size[0], custom_size[1]), unit(opts.unit))
     else:
-        if opts.output_profile.short_name == 'default' or \
-                opts.output_profile.width > 9999:
-            if custom_size is None:
-                printer.setPaperSize(paper_size(opts.paper_size))
-            else:
-                printer.setPaperSize(QSizeF(custom_size[0], custom_size[1]), unit(opts.unit))
-        else:
-            w = opts.output_profile.comic_screen_size[0] if for_comic else \
-                    opts.output_profile.width
-            h = opts.output_profile.comic_screen_size[1] if for_comic else \
-                    opts.output_profile.height
-            dpi = opts.output_profile.dpi
-            printer.setPaperSize(QSizeF(float(w) / dpi, float(h) / dpi), QPrinter.Inch)
+        custom_size = True
+        w = opts.output_profile.comic_screen_size[0] if for_comic else \
+                opts.output_profile.width
+        h = opts.output_profile.comic_screen_size[1] if for_comic else \
+                opts.output_profile.height
+        dpi = opts.output_profile.dpi
+        printer.setPaperSize(QSizeF(float(w) / dpi, float(h) / dpi), QPrinter.Inch)
 
     if for_comic:
         # Comic pages typically have their own margins, or their background
@@ -77,13 +72,13 @@
         printer.setPageMargins(opts.margin_left, opts.margin_top,
                 opts.margin_right, opts.margin_bottom, QPrinter.Point)
     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
+    if isosx and not custom_size:
         printer.setOutputFormat(QPrinter.NativeFormat)
+    else:
+        printer.setOutputFormat(QPrinter.PdfFormat)
 
     return printer