diff --git a/Changelog.yaml b/Changelog.yaml index 3d64dd5e4a..ab3140b2b1 100644 --- a/Changelog.yaml +++ b/Changelog.yaml @@ -11,9 +11,9 @@ - title: Catalog generation type: major description: > - "You can now easily generate a catlog of all books in your calibre library by clicking the arrow next to the convert button. The catalog can be in one of several formats: XML, CSV, EPUB and MOBI, with scope for future formats via plugins. If you generate the catalog in an e-book format, it will be automatically sent to your e-book reader the next time you connect it, allowing you to easily browse your collection on the reader itself." + "You can now easily generate a catlog of all books in your calibre library by clicking the arrow next to the convert button. The catalog can be in one of several formats: XML, CSV, EPUB and MOBI, with scope for future formats via plugins. If you generate the catalog in an e-book format, it will be automatically sent to your e-book reader the next time you connect it, allowing you to easily browse your collection on the reader itself. This feature is in Beta (may have bugs) so feedback is appreciated." - - title: "RTF Input: Support for unicode characters. Needs testing." + - title: "RTF Input: Support for unicode characters." type: major tickets: [4501] diff --git a/src/calibre/ebooks/pdf/reflow.py b/src/calibre/ebooks/pdf/reflow.py index 721df28537..ee60e779e4 100644 --- a/src/calibre/ebooks/pdf/reflow.py +++ b/src/calibre/ebooks/pdf/reflow.py @@ -153,6 +153,21 @@ class Region(object): else: pass + def contains(self, columns): + if not self.columns: + return True + if len(columns) != len(self.columns): + return False + for i in range(len(columns)): + c1, c2 = self.columns[i], columns[i] + x1 = Interval(c1.left, c1.right) + x2 = Interval(c2.left, c2.right) + intersection = x1.intersection(x2) + base = min(x1.width, x2.width) + if intersection.width/base < 0.6: + return False + return True + class Page(object): # Fraction of a character width that two strings have to be apart, diff --git a/src/calibre/gui2/ui.py b/src/calibre/gui2/ui.py index 889ad75645..b132e368ee 100644 --- a/src/calibre/gui2/ui.py +++ b/src/calibre/gui2/ui.py @@ -1402,7 +1402,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI): dynamic.set('catalogs_to_be_synced', sync) self.status_bar.showMessage(_('Catalog generated.'), 3000) self.sync_catalogs() - if job.fmt in ['CSV','XML']: + if job.fmt not in ['EPUB','MOBI']: export_dir = choose_dir(self, _('Export Catalog Directory'), _('Select destination for %s.%s') % (job.catalog_title, job.fmt.lower())) if export_dir: