From d44b0a19cb6e16e7cbbe324b1c351d01980815f5 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Wed, 29 Apr 2015 13:59:28 +0200 Subject: [PATCH] Amend 75f7eafd Was forgetting this last bit from 64e0c558. Also give a message such that the user is informed that not everything is lost if latex fails. With this, the previews are generated also when the document directly specifies a specific pdf output format. --- lib/scripts/legacy_lyxpreview2ppm.py | 2 +- lib/scripts/lyxpreview2bitmap.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/scripts/legacy_lyxpreview2ppm.py b/lib/scripts/legacy_lyxpreview2ppm.py index 597883a4aa..86a873502e 100644 --- a/lib/scripts/legacy_lyxpreview2ppm.py +++ b/lib/scripts/legacy_lyxpreview2ppm.py @@ -302,7 +302,7 @@ def legacy_conversion_step1(latex_file, dpi, output_format, fg_color, bg_color, # Compile the latex file. latex_status, latex_stdout = run_latex(latex, latex_file) if latex_status: - return (latex_status, []) + warning("trying to recover from failed compilation") if pdf_output: return legacy_conversion_step3(latex_file, dpi, output_format, True, skipMetrics) diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py index de4121f2db..dfed2643ed 100755 --- a/lib/scripts/lyxpreview2bitmap.py +++ b/lib/scripts/lyxpreview2bitmap.py @@ -435,7 +435,9 @@ def main(argv): fg_color, bg_color, latex, pdf_output) # Compile the latex file. - run_latex(latex, latex_file, bibtex) + latex_status, latex_stdout = run_latex(latex, latex_file, bibtex) + if latex_status: + warning("trying to recover from failed compilation") # The dvi output file name dvi_file = latex_file_re.sub(".dvi", latex_file)