From 1a20df3291576cb346c42584b14d044f80255bde Mon Sep 17 00:00:00 2001 From: John Schember Date: Mon, 17 Jan 2011 13:17:33 -0500 Subject: [PATCH] Modify italicize patterns to reduce false positivies. --- src/calibre/ebooks/conversion/utils.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/calibre/ebooks/conversion/utils.py b/src/calibre/ebooks/conversion/utils.py index 888d24d791..bfb5f1c153 100644 --- a/src/calibre/ebooks/conversion/utils.py +++ b/src/calibre/ebooks/conversion/utils.py @@ -139,17 +139,17 @@ class HeuristicProcessor(object): ] 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[^\s][^<>_]+?[^\s])?_', + r'(?msu)/(?P[^\s][^<>/]+?[^\s])?/', + r'(?msu)~~(?P[^\s][^<>~]+?[^\s])?~~', + r'(?msu)\*(?P[^\s][^<>\*]+?[^\s])?\*', + r'(?msu)~(?P[^\s][^<>~]+?[^\s])?~', + r'(?msu)_/(?P[^\s][^<>/_]+?[^\s])?/_', + r'(?msu)_\*(?P[^\s][^<>\*_]+?[^\s])?\*_', + r'(?msu)\*/(?P[^\s][^<>/\*]+?[^\s])?/\*', + r'(?msu)_\*/(?P[^\s][^<>\*_]+?[^\s])?/\*_', + r'(?msu)/:(?P[^\s][^<>:/]+?[^\s])?:/', + r'(?msu)\|:(?P[^\s][^<>:\|]+?[^\s])?:\|', ] for word in ITALICIZE_WORDS: