Merge branch 'master' of /home/lilycvs/git/lily/

* 'master' of /home/lilycvs/git/lily/:
  Add --latex lilypond-book option

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 292a7280df7d6ae944775f61b8b1139d7606aaec..7be0bc78b6e0875a919a3309db8dd7d6a86283d9 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -135,6 +135,12 @@ def get_option_parser ():
                   action='store', dest='info_images_dir',
                   default='')
 
+    p.add_option ('--latex',
+                  help=_ ("Run executable PROG instead of latex"),
+                  metavar=_ ("PROG"),
+                  action='store', dest='latex_program',
+                  default='latex')
+
     p.add_option ('--left-padding', 
                   metavar=_ ("PAD"),
                   dest="padding_mm",
@@ -1572,7 +1578,8 @@ def get_latex_textwidth (source):
     tmp_handle.write (latex_document)
     tmp_handle.close ()
     
-    ly.system ('latex %s' % tmpfile, be_verbose=global_options.verbose)
+    ly.system ('%s %s' % (global_options.latex_program, tmpfile),
+               be_verbose=global_options.verbose)
     parameter_string = file (logfile).read()
     
     os.unlink (tmpfile)