From a9a74acbdec1f843e91cecd29135a6a3827bd08b Mon Sep 17 00:00:00 2001 From: John Schember Date: Thu, 2 Apr 2009 20:33:14 -0400 Subject: [PATCH] tweaks --- src/calibre/customize/ui.py | 9 ++++----- src/calibre/ebooks/pdf/pdftohtml.py | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py index ee5dc03713..af85ca523d 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py @@ -265,7 +265,7 @@ def available_input_formats(): def output_format_plugins(): for plugin in _initialized_plugins: if isinstance(plugin, OutputFormatPlugin): - yield plugin.file_type + yield plugin def plugin_for_output_format(fmt): for plugin in output_format_plugins(): @@ -274,10 +274,9 @@ def plugin_for_output_format(fmt): def available_output_formats(): formats = [] - for plugin in _initialized_plugins: - if isinstance(plugin, OutputFormatPlugin): - if not is_disabled(plugin): - formats.append(plugin.file_type) + for plugin in output_format_plugins(): + if not is_disabled(plugin): + formats.append(plugin.file_type) return formats def disable_plugin(plugin_or_name): diff --git a/src/calibre/ebooks/pdf/pdftohtml.py b/src/calibre/ebooks/pdf/pdftohtml.py index 275cfadb08..168923ad1a 100644 --- a/src/calibre/ebooks/pdf/pdftohtml.py +++ b/src/calibre/ebooks/pdf/pdftohtml.py @@ -39,7 +39,7 @@ def pdftohtml(pdf_path): index = os.path.join(tdir, 'index.html') # This is neccessary as pdftohtml doesn't always (linux) respect absolute paths pdf_path = os.path.abspath(pdf_path) - cmd = (PDFTOHTML, '-noframes', '-p', '-nomerge', pdf_path, os.path.basename(index)) + cmd = (PDFTOHTML, '-enc', 'UTF-8', '-noframes', '-p', '-nomerge', '-i', '-q', pdf_path, os.path.basename(index)) cwd = os.getcwd() with CurrentDir(tdir):