X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=python%2Fbook_latex.py;h=fbf98e66bf7fd8af28ffa2eccf6df4fec82d94f0;hb=ff4a77f00d352158e487637b0a537281fd63db1a;hp=8097443f7f320f01c858e2cac7af597eb6f1de66;hpb=5d46c7466c5902d40825c0a5f5ab1c67dbc1591a;p=lilypond.git diff --git a/python/book_latex.py b/python/book_latex.py index 8097443f7f..fbf98e66bf 100644 --- a/python/book_latex.py +++ b/python/book_latex.py @@ -3,6 +3,7 @@ import re import tempfile import os +import subprocess import book_base as BookBase from book_snippets import * import lilylib as ly @@ -180,12 +181,20 @@ def get_latex_textwidth (source, global_options): tmp_handle.write (latex_document) tmp_handle.close () - ly.system ('%s %s' % (global_options.latex_program, tmpfile), - be_verbose=global_options.verbose) - parameter_string = file (logfile).read() - + progress (_ ("Running `%s' on file `%s' to detect default page settings.\n") + % (global_options.latex_program, tmpfile)); + cmd = '%s %s' % (global_options.latex_program, tmpfile); + proc = subprocess.Popen (cmd, + universal_newlines=True, shell=True, + stdout=subprocess.PIPE, stderr=subprocess.PIPE); + if proc.returncode != 0: + warning (_ ("Unable to auto-detect default page settings:\n%s") + % proc.communicate ()[1]); os.unlink (tmpfile) - os.unlink (logfile) + parameter_string = "" + if os.path.exists (logfile): + parameter_string = file (logfile).read() + os.unlink (logfile) columns = 0 m = re.search ('columns=([0-9.]+)', parameter_string)