release: 1.3.147

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 8205f6c3df02f662a0406faca62a2faa90ddb19d..52995c5849c188391383d7177682102b2e0a5aff 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -11,8 +11,6 @@ StaffContext=\translator {
        Generic_property_list = #generic-staff-properties
        \consists "Property_engraver"
        
-       \consists "Multi_measure_rest_engraver"
-
        \consists "Bar_engraver"
  % Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
@@ -32,20 +30,11 @@ StaffContext=\translator {
        \consists "Rest_collision_engraver"
        \consists "Local_key_engraver"
        \consists "Piano_pedal_engraver"
-
-%{
-       The Instrument_name_engravei puts the name of the instrument
-       (\property Staff.instrument Staff.instr for subsequent lines)
-       to the left of a staff.
-
-       This is commented out, so you don't get funny things on the
-       PianoStaff      
        \consists "Instrument_name_engraver"
-%}
 
        \consistsend "Axis_group_engraver"
        
-       MinimumVerticalExtent = ##f
+       MinimumVerticalExtent = #'(-4 . 4)
        ExtraVerticalExtent = ##f
        VerticalExtent = ##f 
 
@@ -134,7 +123,7 @@ VoiceContext = \translator {
        \consists "Voice_devnull_engraver"
        \consists "Output_property_engraver"    
        \consists "Arpeggio_engraver"
-
+       \consists "Multi_measure_rest_engraver"
        \consists "Text_spanner_engraver"
        \consists "Property_engraver"
        
@@ -250,10 +239,11 @@ PianoStaffContext = \translator{
 
        \consists "Vertical_align_engraver"
 
-       alignmentReference = #0
+       
+       
        verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
        VerticalAlignment \override #'forced-distance = #12
-
+       VerticalAlignment \override #'self-alignment-Y = #0
 %      \consistsend "Axis_group_engraver"
 }
 
@@ -412,8 +402,6 @@ ScoreContext = \translator {
        splitInterval = #'(0 . 1)
        changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
 
-       StaffMinimumVerticalExtent = #(cons -4.0 4.0)
-
        barAuto = ##t
        voltaVisibility = ##t
        %  name, glyph id, clef position