* scripts/lilypond-book.py (PREAMBLE_LY): include

lilypond-book-premable.ly

* ly/lilypond-book-preamble.ly: new file.

diff --git a/ChangeLog b/ChangeLog
index ccdae1a0ec6a2c28926cc10646538b6bc5b27319..af75862b24fb34379743801d3d33041d6b9c7fa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-06-14  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * scripts/lilypond-book.py (PREAMBLE_LY): include
+       lilypond-book-premable.ly
+
        * lily/stem.cc (get_beaming): return max of scm_ilength. Fixes
        slurring from/to beams. 
 
@@ -19,7 +22,7 @@
        * lily/parser-scheme.cc: Add ly:parser-error function
 
        * scm/paper.scm: fix typo
-       
+
 2006-06-13  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * THANKS: add RT.

diff --git a/ly/lilypond-book-preamble.ly b/ly/lilypond-book-preamble.ly
index 9ff3e6349ffb6db30ca7a9b1958824a4e7af08f2..3b4d46aeb4f13a0d16d8206e3f7d7966df06359d 100644 (file)
--- a/ly/lilypond-book-preamble.ly
+++ b/ly/lilypond-book-preamble.ly
@@ -3,7 +3,7 @@
 #(set! toplevel-score-handler print-score-with-defaults)
 #(set! toplevel-music-handler
   (lambda (p m)
-   (if (not (eq? (ly:music-property m \'void) #t))
+   (if (not (eq? (ly:music-property m 'void) #t))
         (print-score-with-defaults
          p (scorify-music m p)))))
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 98dba9db583581cb374701f09beb67a9c47364b4..29e112e4987c8e8363b06d90e1e4a71283de4454 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -643,17 +643,7 @@ if 0:
 
 PREAMBLE_LY = '''%%%% Generated by %(program_name)s
 %%%% Options: [%(option_string)s]
-
-#(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)
+\\include "lilypond-book-preamble.ly"
 %(preamble_string)s
 
 
@@ -1497,7 +1487,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: