From 24a0c5e1b6142781b70bb20af6452d3c455bd6b0 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 3 Sep 2011 12:29:21 -0400 Subject: [PATCH 1/2] Textile output fix. --- src/calibre/ebooks/txt/textileml.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/calibre/ebooks/txt/textileml.py b/src/calibre/ebooks/txt/textileml.py index 36dc9952d2..52454dbc96 100644 --- a/src/calibre/ebooks/txt/textileml.py +++ b/src/calibre/ebooks/txt/textileml.py @@ -447,10 +447,10 @@ class TextileMLizer(OEB2HTML): # Close all open tags. tags.reverse() for t in tags: - if tag in ('pre', 'ul', 'ol', 'li', 'table'): - if tag == 'pre': + if t in ('pre', 'ul', 'ol', 'li', 'table'): + if t == 'pre': self.in_pre = False - elif tag in ('ul', 'ol'): + elif t in ('ul', 'ol'): if self.list: self.list.pop() if not self.list: text.append('\n') else: From 9912bdd78f14ecc0eda672d92daf27dfb619cb9a Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 3 Sep 2011 13:09:27 -0400 Subject: [PATCH 2/2] Add text and azw4 extensions to the add dialog. --- src/calibre/gui2/actions/add.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py index 379e72822d..08385f4f3f 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -33,8 +33,8 @@ def get_filters(): (_('LIT Books'), ['lit']), (_('MOBI Books'), ['mobi', 'prc', 'azw']), (_('Topaz books'), ['tpz','azw1']), - (_('Text books'), ['txt', 'rtf']), - (_('PDF Books'), ['pdf']), + (_('Text books'), ['txt', 'text', 'rtf']), + (_('PDF Books'), ['pdf', 'azw4']), (_('SNB Books'), ['snb']), (_('Comics'), ['cbz', 'cbr', 'cbc']), (_('Archives'), ['zip', 'rar']),