Amend 770362da97

preview needs proper --lily-output-dir

(cherry picked from commit 135889c634)

lib/scripts/lyxpreview2bitmap.py

@@ -412,7 +412,11 @@ def main(argv):
     bibtex = find_exe(bibtex or bibtex_commands)
     if lilypond:
         lilypond_book = find_exe_or_terminate(lilypond_book or
-            ["lilypond-book --safe"])
+            ["lilypond-book"])
+        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
     pdf_output = latex in pdflatex_commands
@@ -433,6 +437,10 @@ def main(argv):
         if pdf_output:
             lilypond_book += " --pdf"
         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
         lytex_file = latex_file_re.sub(".lytex", latex_file)

status.24x

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