X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=ly%2Fdeclarations-init.ly;h=598985e8d14952341545699463c999c9a6fc3730;hb=397b68b52ef39748339623ab50e2d74a8f5f26e8;hp=dd838f25da24a5b7868e3a31a93af2d5382c2be2;hpb=3553f8ded1b24af08c8fbcdad46461f82f752ca2;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index dd838f25da..598985e8d1 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,11 +1,11 @@
-\version "2.3.16"
+\version "2.4.0"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
 
 %% named durations
 breve = #(ly:make-duration -1 0)
-longa = #(ly:make-duration -2 0 )
+longa = #(ly:make-duration -2 0)
 maxima = #(ly:make-duration -3 0)
 
 \include "music-functions-init.ly"
@@ -39,6 +39,8 @@ break = #(make-event-chord (list (make-penalty-music -10001 0)))
 noBreak = #(make-event-chord (list (make-penalty-music 10001 0)))
 pageBreak = #(make-event-chord (list (make-penalty-music -10001 -10001)))
 noPageBreak = #(make-event-chord (list (make-penalty-music 0 10001)))
+stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
+startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
 
 
 %
@@ -68,24 +70,27 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 \include "grace-init.ly"
 \include "midi-init.ly"
-\include "book-paper-defaults.ly"
+\include "paper-defaults.ly"
 
-\paper {
-    mm = #(ly:output-def-lookup $defaultbookpaper 'mm)
-    unit = #(ly:output-def-lookup $defaultbookpaper 'unit)
+\layout {
+    mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultpaper 'unit)
 
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)
     cm = #(* 10 mm)
     
     \include "engraver-init.ly"
+
+    #(set-paper-dimension-variables (current-module))
+    
 }
 
 
 #(set-default-paper-size "a4")
 
 
-partCombineListener = \paper {
+partCombineListener = \layout {
     \context {
 	\Voice
 	\consists Note_heads_engraver
@@ -96,6 +101,7 @@ partCombineListener = \paper {
     \context {
 	\Score
 	skipTypesetting = ##t
+	ignoreBarChecks = ##t 
     }
 }
 
@@ -113,3 +119,4 @@ setDefaultDurationToQuarter = { c4 }
 #(define toplevel-book-handler ly:parser-print-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)