Merge branch 'master' into nested-bookparts

[lilypond.git] / ly / declarations-init.ly

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 88fdfe1c0308061213294bec0cf0384177a3e384..2e2f46ecb62891f46391d0727acb80923a870127 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -75,7 +75,7 @@ repeatTie = #(make-music 'RepeatTieEvent)
                  
 \include "grace-init.ly"
 \include "midi-init.ly"
-\include "paper-defaults.ly"
+\include "paper-defaults-init.ly"
 
 \layout {
     mm = #(ly:output-def-lookup $defaultpaper 'mm)
@@ -111,13 +111,18 @@ setDefaultDurationToQuarter = { c4 }
 #(define musicQuotes (make-hash-table 29))
 
 #(define toplevel-book-handler print-book-with-defaults)
+#(define toplevel-bookpart-handler collect-bookpart-for-book)
 #(define toplevel-music-handler collect-music-for-book)
 #(define toplevel-score-handler collect-scores-for-book)
 #(define toplevel-text-handler collect-scores-for-book)
 
+#(define book-bookpart-handler ly:book-add-bookpart!)
 #(define book-music-handler collect-book-music-for-book)
 #(define book-score-handler ly:book-add-score!)
 #(define book-text-handler ly:book-add-score!)
 
+#(define bookpart-score-handler ly:book-add-score!)
+#(define bookpart-text-handler ly:book-add-score!)
+#(define bookpart-music-handler collect-book-music-for-book)
 
 \include "predefined-fretboards-init.ly"