From ef0ec5bd71656ac0e5a596eb3e56838d9928f952 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 18 Aug 2007 05:17:05 +0000 Subject: [PATCH] Enforce minimum indent for lit files --- src/libprs500/ebooks/lrf/html/convert_from.py | 2 ++ src/libprs500/ebooks/lrf/lit/convert_from.py | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libprs500/ebooks/lrf/html/convert_from.py b/src/libprs500/ebooks/lrf/html/convert_from.py index 5a5865f60c..cc1ed8c1db 100644 --- a/src/libprs500/ebooks/lrf/html/convert_from.py +++ b/src/libprs500/ebooks/lrf/html/convert_from.py @@ -997,6 +997,8 @@ class HTMLConverter(object): indent = Span.unit_convert(str(tag_css['text-indent']), self.profile.dpi, pts=True) if not indent: indent = 0 + if hasattr(self, 'minimum_indent') and indent > 0 and indent < self.minimum_indent: + indent = self.minimum_indent else: indent = self.book.defaultTextStyle.attrs['parindent'] diff --git a/src/libprs500/ebooks/lrf/lit/convert_from.py b/src/libprs500/ebooks/lrf/lit/convert_from.py index 7867f4bfad..e7126ae461 100644 --- a/src/libprs500/ebooks/lrf/lit/convert_from.py +++ b/src/libprs500/ebooks/lrf/lit/convert_from.py @@ -42,7 +42,8 @@ def generate_html(pathtolit, logger): logger.info(p.stdout.read()) ret = p.wait() if ret != 0: - shutil.rmtree(tdir) + if os.path.exists(tdir) and os.path.isdir(tdir): + shutil.rmtree(tdir) err = p.stderr.read() raise ConversionError, err return tdir @@ -76,7 +77,8 @@ def process_file(path, options, logger=None): if not options.output: ext = '.lrs' if options.lrs else '.lrf' options.output = os.path.abspath(os.path.basename(os.path.splitext(path)[0]) + ext) - options.output = os.path.abspath(os.path.expanduser(options.output)) + options.output = os.path.abspath(os.path.expanduser(options.output)) + options.minimum_indent = 100 html_process_file(htmlfile, options, logger=logger) finally: shutil.rmtree(tdir)