This commit is contained in:
John Schember 2009-04-02 20:33:14 -04:00
parent 044d1d65fb
commit a9a74acbde
2 changed files with 5 additions and 6 deletions

View File

@ -265,7 +265,7 @@ def available_input_formats():
def output_format_plugins(): def output_format_plugins():
for plugin in _initialized_plugins: for plugin in _initialized_plugins:
if isinstance(plugin, OutputFormatPlugin): if isinstance(plugin, OutputFormatPlugin):
yield plugin.file_type yield plugin
def plugin_for_output_format(fmt): def plugin_for_output_format(fmt):
for plugin in output_format_plugins(): for plugin in output_format_plugins():
@ -274,10 +274,9 @@ def plugin_for_output_format(fmt):
def available_output_formats(): def available_output_formats():
formats = [] formats = []
for plugin in _initialized_plugins: for plugin in output_format_plugins():
if isinstance(plugin, OutputFormatPlugin): if not is_disabled(plugin):
if not is_disabled(plugin): formats.append(plugin.file_type)
formats.append(plugin.file_type)
return formats return formats
def disable_plugin(plugin_or_name): def disable_plugin(plugin_or_name):

View File

@ -39,7 +39,7 @@ def pdftohtml(pdf_path):
index = os.path.join(tdir, 'index.html') index = os.path.join(tdir, 'index.html')
# This is neccessary as pdftohtml doesn't always (linux) respect absolute paths # This is neccessary as pdftohtml doesn't always (linux) respect absolute paths
pdf_path = os.path.abspath(pdf_path) 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() cwd = os.getcwd()
with CurrentDir(tdir): with CurrentDir(tdir):