Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / scripts / lilypond-book.py

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index c6702f09f333270d4e316508653221bba204a81b..486d21fedb92d2122b40b68f60aa43d1f809fbbc 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -166,12 +166,6 @@ def get_option_parser ():
                   help = _ ("process ly_files using COMMAND FILE..."),
                   action='store', 
                   dest='process_cmd', default='lilypond -b eps')
-
-    p.add_option ('--pdf',
-                  action="store_true",
-                  dest="create_pdf",
-                  help="Create PDF files for use with PDFTeX",
-                  default=False)
     
     p.add_option ('', '--psfonts', action="store_true", dest="psfonts",
                   help=_ ('''extract all PostScript fonts into INPUT.psfonts for LaTeX'''
@@ -563,7 +557,7 @@ output = {
  \preLilyPondExample%%
 \fi%%
 \def\lilypondbook{}%%
-\input %(base)s-systems.%(texextension)s%%
+\input %(base)s-systems.tex%%
 \ifx\postLilyPondExample \undefined%%
  \relax%%
 \else%%
@@ -649,7 +643,17 @@ if 0:
 
 PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %%%% Options: [%(option_string)s]
-\\include "lilypond-book-preamble.ly"
+
+#(set! toplevel-score-handler print-score-with-defaults)
+#(set! toplevel-music-handler
+ (lambda (p m)
+ (if (not (eq? (ly:music-property m \'void) #t))
+    (print-score-with-defaults
+    p (scorify-music m p)))))
+
+#(ly:set-option (quote no-point-and-click))
+#(define inside-lilypond-book #t)
+#(define version-seen? #t)
 %(preamble_string)s
 
 
@@ -662,13 +666,13 @@ PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %% ****************************************************************
 
 \paper {
-  #(define dump-extents #t)
-  %(font_dump_setting)s
-  %(paper_string)s
+ #(define dump-extents #t)
+ %(font_dump_setting)s
+ %(paper_string)s
 }
 
 \layout {
-  %(layout_string)s
+ %(layout_string)s
 }
 '''
 
@@ -1163,10 +1167,7 @@ class Lilypond_snippet (Snippet):
             if VERBATIM in self.option_dict:
                 verb = self.substring ('code')
                 str += (output[LATEX][VERBATIM] % vars ())
-
-        texextension = 'tex'
-        if global_options.create_pdf:
-            texextension = 'pdftex'
+        
         str += (output[LATEX][OUTPUT] % vars ())
 
         ## todo: maintain breaks
@@ -1264,7 +1265,7 @@ def find_toplevel_snippets (s, types):
 
     snippets = []
     index = 0
-    found = dict ([(t, None) for t in types])
+    found = dict ((t, None) for t in types)
 
     line_starts = find_linestarts (s)
     line_start_idx = 0
@@ -1387,10 +1388,10 @@ def process_snippets (cmd, ly_snippets, texstr_snippets, png_snippets):
     def my_system (cmd):
         status = ly.system (cmd,
                   be_verbose=global_options.verbose, 
-                  progress_p=1)
+                  progress_p= 1)
 
     if global_options.format in (HTML, TEXINFO):
-        cmd += ' --formats=png '
+        cmd += ' --format png '
 
     # UGH
     # the --process=CMD switch is a bad idea
@@ -1496,7 +1497,7 @@ class Compile_error:
 def write_file_map (lys, name):
     snippet_map = open ('snippet-map.ly', 'w')
     snippet_map.write ("""
-#(define version-seen #t)
+#(define version-seen? #t)
 #(ly:add-file-name-alist '(
 """)
     for ly in lys:
@@ -1721,17 +1722,9 @@ def main ():
     formats = 'ps'
     if global_options.format in (TEXINFO, HTML):
         formats += ',png'
-
-    if (global_options.format in (TEXINFO, LATEX)
-        and global_options.create_pdf):
-        formats += ",pdf"
-        
     if global_options.process_cmd == '':
-        global_options.process_cmd = (lilypond_binary 
-                                      + ' --formats=%s --backend eps ' % formats)
-
-        if global_options.create_pdf:
-            global_options.process_cmd += ' -dgs-font-load -deps-font-include '
+        global_options.process_cmd = lilypond_binary \
+               + ' --formats=%s --backend eps ' % formats
 
     if global_options.process_cmd:
         global_options.process_cmd += string.join ([(' -I %s' % commands.mkarg (p))
@@ -1760,18 +1753,18 @@ def main ():
         exit (1)
 
     if global_options.format in (TEXINFO, LATEX):
+        if not global_options.psfonts:
+            warning (_ ("option --psfonts not used"))
+            warning (_ ("processing with dvips will have no fonts"))
+
         psfonts_file = os.path.join (global_options.output_name, basename + '.psfonts')
         output = os.path.join (global_options.output_name, basename +  '.dvi' )
         
-        if not global_options.psfonts and not global_options.create_pdf:
-            warning (_ ("option --psfonts not used"))
-            warning (_ ("processing with dvips will have no fonts"))
-        else:
-            progress ('\n')
-            progress (_ ("DVIPS usage:"))
-            progress ('\n')
-            progress ("    dvips -h %(psfonts_file)s %(output)s" % vars ())
-            progress ('\n')
+        progress ('\n')
+        progress (_ ("DVIPS usage:"))
+        progress ('\n')
+        progress ("    dvips -h %(psfonts_file)s %(output)s" % vars ())
+        progress ('\n')
 
     inputs = note_input_file ('')
     inputs.pop ()