Compare commits

..

No commits in common. "2051bfed437fa0171483681e8c45a9310214b180" and "f56fcd01a289443d33f613de4f173ab7f03c8473" have entirely different histories.

2 changed files with 1 additions and 11 deletions

View File

@ -412,11 +412,7 @@ def main(argv):
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 = find_exe_or_terminate(lilypond_book or
["lilypond-book"]) ["lilypond-book --safe"])
if lilypond_book and latex == "latex":
# with lilypond, we default to pdflatex rather than latex
# as we do not want to deal with eps conversion (see #13103)
latex = "pdflatex"
# 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
@ -437,10 +433,6 @@ def main(argv):
if pdf_output: if pdf_output:
lilypond_book += " --pdf" lilypond_book += " --pdf"
lilypond_book += " --latex-program=%s" % latex.split()[0] lilypond_book += " --latex-program=%s" % latex.split()[0]
if pdf_output:
lilypond_book += " --lily-output-dir=ly-pdf"
else:
lilypond_book += " --lily-output-dir=ly-eps"
# 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)

View File

@ -55,8 +55,6 @@ What's new
- Work around bug in aa.cls in the "Astronomy & Astrophysics" template - Work around bug in aa.cls in the "Astronomy & Astrophysics" template
and example documents. and example documents.
- Fix instant preview of lilypond snippets (bug 13103).
* USER INTERFACE * USER INTERFACE