X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=ly%2Fdeclarations-init.ly;h=4ed75b741857838a914aee3c16b57a309cf1ac85;hb=a58f7c318d150b5beff929589bcf598602b78a81;hp=f60c9f4578ba2004ecfe1bbebffe7aefc4711291;hpb=b319f8f1777ffae53a80c3efab2a18884d4d549e;p=lilypond.git

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index f60c9f4578..4ed75b7418 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -35,10 +35,19 @@ center = #0
 %% try \once \set Score.allowBeamBreak = ##t
 
 %% rather name \newline, \pageBreak ?
-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)))
+break = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission 'force)))
+noBreak = #(make-event-chord (list (make-music 'LineBreakEvent 'break-permission '())))
+pageBreak = #(make-event-chord (list
+				(make-music 'LineBreakEvent 'break-permission 'force)
+				(make-music 'PageBreakEvent 'break-permission 'force)))
+noPageBreak = #(make-event-chord (list (make-music 'PageBreakEvent 'break-permission '())))
+pageTurn = #(make-event-chord (list
+				(make-music 'LineBreakEvent 'break-permission 'force)
+				(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)))
 
@@ -63,8 +72,9 @@ escapedSmallerSymbol = #(make-span-event 'CrescendoEvent START)
 
 \include "scale-definitions-init.ly"
 
-melisma = #(make-span-event 'ManualMelismaEvent START)
-melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
+melisma = #(context-spec-music (make-property-set 'melismaBusy #t) 'Bottom)
+melismaEnd = #(context-spec-music (make-property-unset 'melismaBusy) 'Bottom)
+
 laissezVibrer = #(make-music 'LaissezVibrerEvent)
 repeatTie = #(make-music 'RepeatTieEvent)
 		  
@@ -99,7 +109,7 @@ partCombineListener = \layout {
     \context {
 	\Score
 	skipTypesetting = ##t
-	ignoreBarChecks = ##t 
+	ignoreBarChecks = ##t
     }
 }