patch::: 1.5.30.uu1

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 104d8ab6eace08e186aa9b72fce1e12152f95678..5c309e6fb4a53d3809799f331083aa27b2b29e28 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -20,7 +20,7 @@ StaffContext=\translator {
        \consists "Separating_line_group_engraver"      
        SeparatingGroupSpanner \override #'spacing-procedure
          =  #Separating_group_spanner::set_spacing_rods_and_seqs
-
+       \consists "Dot_column_engraver"
 
        \consists "Clef_engraver"
        \consists "Key_engraver"
@@ -31,6 +31,7 @@ StaffContext=\translator {
        \consists "Accidental_engraver"
        \consists "Piano_pedal_engraver"
        \consists "Instrument_name_engraver"
+       \consists "Grob_pq_engraver"
 
        \consistsend "Axis_group_engraver"
        
@@ -128,7 +129,6 @@ VoiceContext = \translator {
        
        \consists "Breathing_sign_engraver"
        % \consists "Rest_engraver"
-       \consists "Dot_column_engraver"
        \consists "Stem_engraver"
        \consists "Beam_engraver"
        \consists "Auto_beam_engraver"
@@ -141,9 +141,9 @@ VoiceContext = \translator {
  Must come before text_engraver, but after note_column engraver.
 
 %}
+       \consists "Text_engraver"
        \consists "Dynamic_engraver"
        \consists "Fingering_engraver"
-%      \consists "Text_engraver"
 
        \consists "Script_engraver"
        \consists "Script_column_engraver"
@@ -240,6 +240,7 @@ LyricsVoiceContext= \translator{
        \consists "Extender_engraver"
        \consists "Hyphen_engraver"
        \consists "Stanza_number_engraver"
+       \consists "Skip_req_swallow_translator"
        phrasingPunctuation = #".,:!?\""
        
 }
@@ -324,6 +325,7 @@ ScoreContext = \translator {
        \name Score
        
        \consists "Repeat_acknowledge_engraver"
+       \consists "Staff_collecting_engraver"
        \consists "Timing_engraver"
        \consists "Output_property_engraver"
        \consists "System_start_delimiter_engraver"
@@ -382,6 +384,10 @@ ScoreContext = \translator {
        tupletNumberFormatFunction = #denominator-tuplet-formatter
        
        subdivideBeams = ##f
+       extraNatural = ##t
+       autoAccidentals = #'((measure-same-octave . 0))
+       autoCautionaries = #'()  
+
 
        keyAccidentalOrder = #'(
          (6 . -1) (2  . -1) (5 . -1 ) (1  . -1) (4  . -1) (0  . -1) (3  . -1)