From 53f02e555e0557c8cdae4927d2af8705f90be8ad Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 28 May 2010 16:26:22 -0600 Subject: [PATCH] Conversion pipeline: Run conversion removal regexps first to make them act on text closer to that shown in the regex builder --- src/calibre/ebooks/conversion/preprocess.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/ebooks/conversion/preprocess.py b/src/calibre/ebooks/conversion/preprocess.py index a42f0fc73b..40c67453b2 100644 --- a/src/calibre/ebooks/conversion/preprocess.py +++ b/src/calibre/ebooks/conversion/preprocess.py @@ -252,7 +252,7 @@ class HTMLPreProcessor(object): end_rules = [] if getattr(self.extra_opts, 'remove_header', None): try: - end_rules.append( + rules.insert(0, (re.compile(self.extra_opts.header_regex), lambda match : '') ) except: @@ -262,7 +262,7 @@ class HTMLPreProcessor(object): if getattr(self.extra_opts, 'remove_footer', None): try: - end_rules.append( + rules.insert(0 (re.compile(self.extra_opts.footer_regex), lambda match : '') ) except: