X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Flilypond-book-preamble.ly;h=e6e72503eb7d182581555708b5a49ff69851b985;hb=d65a3a9777a9e96029f6aa408d86d13a88f6619d;hp=75bce0045d870446977fb0f003b6d342e62ce52e;hpb=a4e8f80c112c489026ea35e051b0f56f2f13a9cf;p=lilypond.git

diff --git a/ly/lilypond-book-preamble.ly b/ly/lilypond-book-preamble.ly
index 75bce0045d..e6e72503eb 100644
--- a/ly/lilypond-book-preamble.ly
+++ b/ly/lilypond-book-preamble.ly
@@ -1,12 +1,30 @@
 
-\version "2.9.9"
-
-#(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)))))
+\version "2.12.0"
+
+%% toplevel \book gets output per page,
+%% everything else gets output per system/title
+#(define default-toplevel-book-handler
+  print-book-with-defaults-as-systems )
+
+#(define toplevel-book-handler
+  (lambda ( . rest)
+  (set! output-empty-score-list #f)
+  (apply print-book-with-defaults rest)))
+
+#(define toplevel-music-handler
+  (lambda ( . rest)
+   (apply collect-music-for-book rest)))
+
+#(define toplevel-score-handler
+  (lambda ( . rest)
+   (apply collect-scores-for-book rest)))
+
+#(define toplevel-text-handler
+  (lambda ( . rest)
+   (apply collect-scores-for-book rest)))
+
+#(set! output-empty-score-list #t)
+
 
 #(ly:set-option (quote no-point-and-click))
 #(define inside-lilypond-book #t)