From f593b2163154bcd61e21b0e06f8cf0e29514af86 Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 8 Jan 2011 13:53:32 -0500 Subject: [PATCH] TXT Input: Tweak Heuristic italicizing. --- src/calibre/ebooks/txt/heuristicprocessor.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/txt/heuristicprocessor.py b/src/calibre/ebooks/txt/heuristicprocessor.py index cbfa33a96a..b0bbd49961 100644 --- a/src/calibre/ebooks/txt/heuristicprocessor.py +++ b/src/calibre/ebooks/txt/heuristicprocessor.py @@ -21,15 +21,15 @@ class TXTHeuristicProcessor(object): ] self.ITALICIZE_STYLE_PATS = [ r'(?msu)_(?P.+?)_', - r'(?msu)/(?P.+?)/', + r'(?msu)/(?P[^<>]+?)/', r'(?msu)~~(?P.+?)~~', r'(?msu)\*(?P.+?)\*', r'(?msu)~(?P.+?)~', - r'(?msu)_/(?P.+?)/_', + r'(?msu)_/(?P[^<>]+?)/_', r'(?msu)_\*(?P.+?)\*_', - r'(?msu)\*/(?P.+?)/\*', - r'(?msu)_\*/(?P.+?)/\*_', - r'(?msu)/:(?P.+?):/', + r'(?msu)\*/(?P[^<>]+?)/\*', + r'(?msu)_\*/(?P[^<>]+?)/\*_', + r'(?msu)/:(?P[^<>]+?):/', r'(?msu)\|:(?P.+?):\|', ] @@ -84,5 +84,6 @@ class TXTHeuristicProcessor(object): txt = u'\n'.join(processed) txt = re.sub('[ ]{2,}', ' ', txt) + print txt return HTML_TEMPLATE % (title, txt)