anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correctly indicate the failing converter

Browse Source 
If epstopdf fails, pdftocairo is not called but the warning points
the finger to it. Also correctly indicate the failing file.
This commit is contained in:
Enrico Forestieri 2015-04-29 16:20:27 +02:00
parent d44b0a19cb
commit ca921fd650
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/scripts/legacy_lyxpreview2ppm.py
View File

@ -462,7 +462,7 @@ def legacy_conversion_step3(latex_file, dpi, output_format, dvips_failed, skipMe
else:
# Model for calling the converter on each file
if use_pdftocairo and epstopdf != None:
conv_call = '%s -png -transp -singlefile -r %d "%%s.pdf" "%s%%d"' \
conv_call = '%s -png -transp -singlefile -r %d "%%s" "%s%%d"' \
% (pdftocairo, resolution, latex_file_root)
else:
conv_call = '%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=%s ' \
@ -482,10 +482,12 @@ def legacy_conversion_step3(latex_file, dpi, output_format, dvips_failed, skipMe
i = i + 1
progress("Processing page %s, file %s" % (i, file))
if use_pdftocairo and epstopdf != None:
conv_name = "pdftocairo"
conv_name = "epstopdf"
conv_status, conv_stdout = run_command("%s --outfile=%s.pdf %s"
% (epstopdf, file, file))
if not conv_status:
conv_name = "pdftocairo"
file = file + ".pdf"
conv_status, conv_stdout = run_command(conv_call % (file, i))
else:
conv_name = "ghostscript"