Don't set 'tieMelismaBusy until old waiting heads have been cleared

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 28c7c9706f09b042de8b02f442eb9ff946bbe52c..8cfd9db44ca4e969cd52e40d115cac00525c1288 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -208,7 +208,6 @@ subscripts, slurs, ties, and rests.
 You have to instantiate this explicitly if you want to have
 multiple voices on the same staff."
 
 You have to instantiate this explicitly if you want to have
 multiple voices on the same staff."
 

-  localKeySignature = #'()

   \consists "Font_size_engraver"
 
   \consists "Pitched_trill_engraver"
   \consists "Font_size_engraver"
 
   \consists "Pitched_trill_engraver"


@@ -229,6 +228,7 @@ multiple voices on the same staff."
   \consists "Dots_engraver"
   \consists "Rest_engraver"
   \consists "Tweak_engraver"
   \consists "Dots_engraver"
   \consists "Rest_engraver"
   \consists "Tweak_engraver"

+  \consists "Footnote_engraver"

 
   %% switch on to make stem directions interpolate for the
   %% center line.
 
   %% switch on to make stem directions interpolate for the
   %% center line.


@@ -323,6 +323,10 @@ contained staves are connected vertically."
 
   \defaultchild "Staff"
   \accepts "Staff"
 
   \defaultchild "Staff"
   \accepts "Staff"

+  \accepts "RhythmicStaff"
+  \accepts "DrumStaff"
+  \accepts "TabStaff"
+  \accepts "Lyrics"

   \accepts "FiguredBass"
   \accepts "Dynamics"
   \accepts "ChordNames"
   \accepts "FiguredBass"
   \accepts "Dynamics"
   \accepts "ChordNames"


@@ -394,6 +398,7 @@ a collection of staves, with a bracket in front and spanning bar lines."
   \consists "Text_engraver"
   \consists "Text_spanner_engraver"
   \consists "Axis_group_engraver"
   \consists "Text_engraver"
   \consists "Text_spanner_engraver"
   \consists "Axis_group_engraver"

+  \consists "Tweak_engraver"

 
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")
 
   pedalSustainStrings = #'("Ped." "*Ped." "*")
   pedalUnaCordaStrings = #'("una corda" "" "tre corde")


@@ -460,8 +465,18 @@ printing of a single line of lyrics."
   \description "A context for printing the names of notes."
   \consists "Axis_group_engraver"
 
   \description "A context for printing the names of notes."
   \consists "Axis_group_engraver"
 

-  % FIXME: not sure what the default should be here.
-  \override VerticalAxisGroup #'staff-affinity = #DOWN
+  \override VerticalAxisGroup #'staff-affinity = #UP
+  \override VerticalAxisGroup #'nonstaff-nonstaff-spacing =
+    #'((basic-distance . 0)
+       (minimum-distance . 2.8)
+       (padding . 0.2)
+       (stretchability . 0))
+  \override VerticalAxisGroup #'nonstaff-relatedstaff-spacing =
+    #'((basic-distance . 5.5)
+       (padding . 0.5)
+       (stretchability . 1))
+  \override VerticalAxisGroup
+    #'nonstaff-unrelatedstaff-spacing #'padding = 1.5

 
   \consists "Tie_engraver"
   \consists "Note_name_engraver"
 
   \consists "Tie_engraver"
   \consists "Note_name_engraver"


@@ -1070,4 +1085,3 @@ RemoveEmptyTabStaffContext = \context {
   \TabStaff
   \RemoveEmptyStaves
 }
   \TabStaff
   \RemoveEmptyStaves
 }

-