anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lyxpreview: Simplify the handling of lilypond-book.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39796 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Julien Rioux 2011-10-03 16:35:29 +00:00
parent 13b1277cd2
commit 873f0f4297
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/scripts/lyxpreview2bitmap.py
View File

@ -392,7 +392,8 @@ def main(argv):
latex = find_exe_or_terminate(latex or latex_commands) latex = find_exe_or_terminate(latex or latex_commands)
bibtex = find_exe(bibtex or bibtex_commands) bibtex = find_exe(bibtex or bibtex_commands)
if lilypond: if lilypond:
lilypond_book = find_exe_or_terminate(lilypond_book or ["lilypond-book"]) lilypond_book = find_exe_or_terminate(lilypond_book or
["lilypond-book --safe"])
# These flavors of latex are known to produce pdf output # These flavors of latex are known to produce pdf output
pdf_output = latex in pdflatex_commands pdf_output = latex in pdflatex_commands
@ -411,19 +412,15 @@ def main(argv):
if lilypond: if lilypond:
progress("Preprocess the latex file through %s" % lilypond_book) progress("Preprocess the latex file through %s" % lilypond_book)
if pdf_output: if pdf_output:
lilypond_book += ' --pdf' lilypond_book += " --pdf"
lilypond_book += " --latex-program=%s" % latex.split()[0]
# Make a copy of the latex file # Make a copy of the latex file
lytex_file = latex_file_re.sub(".lytex", latex_file) lytex_file = latex_file_re.sub(".lytex", latex_file)
shutil.copyfile(latex_file, lytex_file) shutil.copyfile(latex_file, lytex_file)
# Preprocess the latex file through lilypond-book. # Preprocess the latex file through lilypond-book.
lytex_call = '%s --safe --latex-program=%s "%s"' % (lilypond_book, lytex_status, lytex_stdout = run_tex(lilypond_book, lytex_file)
latex, lytex_file)
lytex_status, lytex_stdout = run_command(lytex_call)
if lytex_status:
warning("%s failed to compile %s" \
% (os.path.basename(lilypond_book), lytex_file))
if pdf_output: if pdf_output:
progress("Using the legacy conversion method (PDF support)") progress("Using the legacy conversion method (PDF support)")