From ff160288b9b68aff4423a7e38640c19af465ab63 Mon Sep 17 00:00:00 2001 From: John Schember Date: Tue, 22 Mar 2011 18:58:52 -0400 Subject: [PATCH 1/4] TXT Input: Textile: Add escapes for specifying non chaning quotes. --- src/calibre/ebooks/textile/functions.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/calibre/ebooks/textile/functions.py b/src/calibre/ebooks/textile/functions.py index c3c82ef893..bf3f7b26e7 100755 --- a/src/calibre/ebooks/textile/functions.py +++ b/src/calibre/ebooks/textile/functions.py @@ -206,6 +206,12 @@ class Textile(object): (re.compile(r'{clubs?}'), r'♣'), # club (re.compile(r'{hearts?}'), r'♥'), # heart (re.compile(r'{diam(onds?|s)}'), r'♦'), # diamond + (re.compile(r'{"}'), r'"'), # double-quote + (re.compile(r"{'}"), r'''), # single-quote + (re.compile(r'{’}'), r'’'), # closing-single-quote - apostrophe + (re.compile(r'{‘}'), r'‘'), # opening-single-quote + (re.compile(r'{“}'), r'”'), # closing-double-quote + (re.compile(r'{“}'), r'“'), # opening-double-quote ] glyph_defaults = [ (re.compile(r'(\d+\'?\"?)( ?)x( ?)(?=\d+)'), r'\1\2×\3'), # dimension sign From 5879e4a3512995ea32be355da25434cd3619999b Mon Sep 17 00:00:00 2001 From: John Schember Date: Tue, 22 Mar 2011 19:07:16 -0400 Subject: [PATCH 2/4] Add file encoding. --- src/calibre/ebooks/textile/functions.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/ebooks/textile/functions.py b/src/calibre/ebooks/textile/functions.py index bf3f7b26e7..b9a0bf2368 100755 --- a/src/calibre/ebooks/textile/functions.py +++ b/src/calibre/ebooks/textile/functions.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# -*- coding: utf-8 -*- + """ PyTextile From 8c0c9b99497abeca2fbb15900a4e748dbb0ed980 Mon Sep 17 00:00:00 2001 From: John Schember Date: Tue, 22 Mar 2011 20:05:12 -0400 Subject: [PATCH 3/4] ... --- src/calibre/ebooks/textile/functions.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/textile/functions.py b/src/calibre/ebooks/textile/functions.py index b9a0bf2368..b01a7bcdb7 100755 --- a/src/calibre/ebooks/textile/functions.py +++ b/src/calibre/ebooks/textile/functions.py @@ -210,10 +210,10 @@ class Textile(object): (re.compile(r'{diam(onds?|s)}'), r'♦'), # diamond (re.compile(r'{"}'), r'"'), # double-quote (re.compile(r"{'}"), r'''), # single-quote - (re.compile(r'{’}'), r'’'), # closing-single-quote - apostrophe - (re.compile(r'{‘}'), r'‘'), # opening-single-quote - (re.compile(r'{“}'), r'”'), # closing-double-quote - (re.compile(r'{“}'), r'“'), # opening-double-quote + (re.compile(r"{(’|'/|/')}"), r'’'), # closing-single-quote - apostrophe + (re.compile(r"{(‘|\\'|'\\)}"), r'‘'), # opening-single-quote + (re.compile(r'{(”|"/|/")}'), r'”'), # closing-double-quote + (re.compile(r'{(“|\\"|"\\)}'), r'“'), # opening-double-quote ] glyph_defaults = [ (re.compile(r'(\d+\'?\"?)( ?)x( ?)(?=\d+)'), r'\1\2×\3'), # dimension sign From b5ccf33204bfaeff2fea0eed99d61aa422de853e Mon Sep 17 00:00:00 2001 From: John Schember Date: Tue, 22 Mar 2011 20:14:29 -0400 Subject: [PATCH 4/4] ... --- src/calibre/ebooks/txt/input.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/ebooks/txt/input.py b/src/calibre/ebooks/txt/input.py index 7face4c24f..cad55b8c3f 100644 --- a/src/calibre/ebooks/txt/input.py +++ b/src/calibre/ebooks/txt/input.py @@ -165,7 +165,7 @@ class TXTInput(InputFormatPlugin): elif options.formatting_type == 'textile': log.debug('Running text through textile conversion...') html = convert_textile(txt) - setattr(options, 'smarten_punctuation', True) + #setattr(options, 'smarten_punctuation', True) else: log.debug('Running text through basic conversion...') flow_size = getattr(options, 'flow_size', 0)