Use a `define-builtin-markup-command' macro for builtin markups, which

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

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 027849b88ca0a6c0c23f89256f0b12e7a1d9f247..17329521a071743fdd1e2031788d7ed1ebc81dda 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,4 +1,4 @@
-\version "2.7.39"
+\version "2.10.0"
 
 %% < 1.8 compatibility switch
 #(ly:set-option 'old-relative)
@@ -8,6 +8,7 @@ breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0)
 maxima = #(ly:make-duration -3 0)
 
+\include "markup-init.ly"
 \include "music-functions-init.ly"
 
 %% default note names are dutch
@@ -46,6 +47,7 @@ pageTurn = #(make-event-chord (list
                                (make-music 'PageBreakEvent 'break-permission 'force)
                                (make-music 'PageTurnEvent 'break-permission 'force)))
 noPageTurn = #(make-event-chord (list (make-music 'PageTurnEvent 'break-permission '())))
+allowPageTurn = #(make-event-chord (list (make-music 'PageTurnEvent 'break-permission 'allow)))
 
 stopStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent STOP)))
 startStaff = #(make-event-chord (list (make-span-event 'StaffSpanEvent START)))
@@ -96,24 +98,15 @@ repeatTie = #(make-music 'RepeatTieEvent)
 
 #(set-default-paper-size (ly:get-option 'paper-size))
 
-
 partCombineListener = \layout {
-    \context {
-       \Voice
-       \consists Note_heads_engraver
-       \consists Rest_engraver
-       \type "Recording_group_engraver"
-       recordEventSequence = #notice-the-events-for-pc
-    }
     \context {
        \Score
        skipTypesetting = ##t
-       ignoreBarChecks = ##t 
+       ignoreBarChecks = ##t
+       \alias "Timing"
     }
 }
 
-#(set-part-combine-listener partCombineListener)
-
 \include "dynamic-scripts-init.ly"
 \include "spanners-init.ly"
 \include "property-init.ly"