From: John Mandereau <john.mandereau@gmail.com>
Date: Sun, 10 Jan 2010 15:38:12 +0000 (+0100)
Subject: Make lilypond-book call pdflatex by default if --pdf is given
X-Git-Tag: release/2.13.11-1~32
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8e3d69a83919b4754f73c1ad99239938d157edb8;p=lilypond.git

Make lilypond-book call pdflatex by default if --pdf is given

This fixes LaTeX crashes that happen for documents which declare
packages with options not compatible with DVI mode.  See dicussion on
users list at
http://lists.gnu.org/archive/html/lilypond-user/2010-01/msg00093.html
---

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 5dd263b6ac..202af65408 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -164,7 +164,8 @@ def get_option_parser ():
                   default='')
 
     p.add_option ('--latex-program',
-                  help=_ ("run executable PROG instead of latex"),
+                  help=_ ("run executable PROG instead of latex, or in\n\
+case --pdf option is set instead of pdflatex"),
                   metavar=_ ("PROG"),
                   action='store', dest='latex_program',
                   default='latex')
@@ -2150,6 +2151,8 @@ def main ():
         global_options.process_cmd += ' --formats=eps '
         if global_options.create_pdf:
             global_options.process_cmd += "--pdf -dinclude-eps-fonts -dgs-load-fonts "
+            if global_options.latex_program == 'latex':
+                global_options.latex_program = 'pdflatex'
 
     if global_options.verbose:
         global_options.process_cmd += " --verbose "