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 3fe9421fa2af635fe3497fb656cf96d69744c724..486d21fedb92d2122b40b68f60aa43d1f809fbbc 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -643,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
 
 
@@ -656,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
 }
 '''
 
@@ -1255,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
@@ -1378,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
@@ -1487,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:
@@ -1743,18 +1753,18 @@ def main ():
         exit (1)
 
     if global_options.format in (TEXINFO, LATEX):
-        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:
             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')
+
+        psfonts_file = os.path.join (global_options.output_name, basename + '.psfonts')
+        output = os.path.join (global_options.output_name, basename +  '.dvi' )
+        
+        progress ('\n')
+        progress (_ ("DVIPS usage:"))
+        progress ('\n')
+        progress ("    dvips -h %(psfonts_file)s %(output)s" % vars ())
+        progress ('\n')
 
     inputs = note_input_file ('')
     inputs.pop ()