X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Flilypond-book-preamble.ly;h=fe210ca89ffb04376596b96a38084cf87e86dbbd;hb=refs%2Fheads%2Fbugs%2F567849;hp=aa82b7330c55c4e33e435f684f3e693f1f3f9e1a;hpb=730c54a571ab3b6c30e02be5f93c876abee0f9a7;p=lilypond.git

diff --git a/ly/lilypond-book-preamble.ly b/ly/lilypond-book-preamble.ly
index aa82b7330c..fe210ca89f 100644
--- a/ly/lilypond-book-preamble.ly
+++ b/ly/lilypond-book-preamble.ly
@@ -1,12 +1,30 @@
 
-\version "2.10.0"
-
-#(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.14.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)