release: 1.5.28

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 968fd4b11e078f4b1e3c87ff46a62ba089793ab9..26cd85e811d9268ff4cfca11b6a663f0666dcd57 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -18,8 +18,8 @@ StaffContext=\translator {
 %      \consists "Repeat_engraver"
        \consists "Volta_engraver"
        \consists "Separating_line_group_engraver"      
-
-
+       SeparatingGroupSpanner \override #'spacing-procedure
+         =  #Separating_group_spanner::set_spacing_rods_and_seqs
 
        \consists "Clef_engraver"
        \consists "Key_engraver"
@@ -27,9 +27,10 @@ StaffContext=\translator {
        \consists "Staff_symbol_engraver"
        \consists "Collision_engraver"
        \consists "Rest_collision_engraver"
-       \consists "Local_key_engraver"
+       \consists "Accidental_engraver"
        \consists "Piano_pedal_engraver"
        \consists "Instrument_name_engraver"
+       \consists "Grob_pq_engraver"
 
        \consistsend "Axis_group_engraver"
        
@@ -39,7 +40,7 @@ StaffContext=\translator {
 
        % explicitly set instrument, so we don't get 
        % weird effects when doing instrument names for
-       % piano staffs
+       % piano staves
 
        instrument = ##f
        instr = ##f
@@ -64,7 +65,7 @@ InnerChoirStaffContext = \translator {
        \name InnerChoirStaff
        alignmentReference = #0
        \consists "System_start_delimiter_engraver"
-       SystemStartDelimiter \override #'glyph = #'bracket
+       SystemStartDelimiter = #'SystemStartBracket
 
        \accepts "Staff"
        \accepts "RhythmicStaff"
@@ -140,8 +141,9 @@ VoiceContext = \translator {
  Must come before text_engraver, but after note_column engraver.
 
 %}
-       \consists "Dynamic_engraver"
        \consists "Text_engraver"
+       \consists "Dynamic_engraver"
+       \consists "Fingering_engraver"
 
        \consists "Script_engraver"
        \consists "Script_column_engraver"
@@ -149,6 +151,7 @@ VoiceContext = \translator {
        \consists "Phrasing_slur_engraver"
        \consists "Slur_engraver"
        \consists "Tie_engraver"
+       \consists "Porrectus_engraver"
        \consists "Tuplet_engraver"
        \consists "A2_engraver"
 
@@ -175,8 +178,7 @@ GrandStaffContext=\translator{
        \consists "Span_bar_engraver"
        \consists "Span_arpeggio_engraver"
        \consists "System_start_delimiter_engraver"
-       SystemStartDelimiter \override #'glyph = #'brace
-       
+       SystemStartDelimiter = #'SystemStartBrace
        Generic_property_list = #generic-grand-staff-properties
        \accepts "Staff"
 }
@@ -204,7 +206,7 @@ InnerStaffGroupContext= \translator {
        \consists "Span_bar_engraver"
        \consists "Span_arpeggio_engraver"
        \consists "Output_property_engraver"    
-       SystemStartDelimiter \override #'glyph = #'bracket
+       SystemStartDelimiter = #'SystemStartBracket
 
        \consists "System_start_delimiter_engraver"
        \accepts "Staff"
@@ -221,6 +223,7 @@ StaffGroupContext = \translator {
        \accepts "InnerChoirStaff"
        \accepts "ChoirStaff"
        \accepts "InnerStaffGroup"
+       \accepts "FiguredBass"
 }
 
 
@@ -320,8 +323,8 @@ ScoreContext = \translator {
        \type Score_engraver
        \name Score
        
-
        \consists "Repeat_acknowledge_engraver"
+       \consists "Staff_collecting_engraver"
        \consists "Timing_engraver"
        \consists "Output_property_engraver"
        \consists "System_start_delimiter_engraver"
@@ -329,7 +332,6 @@ ScoreContext = \translator {
        \consists "Break_align_engraver"
        \consists "Spacing_engraver"
        \consists "Vertical_align_engraver"
-
        \consists "Lyric_phrasing_engraver"
        \consists "Bar_number_engraver"
        \consists "Span_arpeggio_engraver"
@@ -344,6 +346,7 @@ ScoreContext = \translator {
        \accepts "ChoirStaff"
        \accepts "PianoStaff"
        \accepts "NoteNames"
+       \accepts "FiguredBass"  
 
        soloText = #"Solo"
        soloIIText = #"Solo II"
@@ -351,7 +354,7 @@ ScoreContext = \translator {
        soloADue = ##t
        splitInterval = #'(0 . 1)
        changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
-
+       SystemStartDelimiter =#'SystemStartBar
        barAuto = ##t
        voltaVisibility = ##t
        %  name, glyph id, clef position 
@@ -367,7 +370,8 @@ ScoreContext = \translator {
 
        explicitClefVisibility = #all-visible
        explicitKeySignatureVisibility = #all-visible
-       
+       autoBeamSettings = #auto-beam-settings
+
        scriptDefinitions = #default-script-alist
 
        verticalAlignmentChildCallback = #Align_interface::alignment_callback
@@ -378,10 +382,18 @@ 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)
         (3  . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1)
-       )
+         (6 . -2) (2  . -2) (5 . -2 ) (1  . -2) (4  . -2) (0  . -2) (3 . -2)
+         (3  . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2)
+        )
        breakAlignOrder = #'(
          Instrument_name
          Left_edge_item
@@ -395,7 +407,7 @@ ScoreContext = \translator {
        )
 
 
-       \elementdescriptions #all-grob-descriptions
+       \grobdescriptions #all-grob-descriptions
 }
 
 OrchestralScoreContext= \translator {
@@ -407,7 +419,14 @@ EasyNotation =  \translator {
        easyPlay = ##t
 }
 
-% retain for compatibility reasons.
+% retain for compatibility reasons (FIXME: convert-ly)
 GraceContext = \translator {
        \type "Engraver_group_engraver"
 }
+
+FiguredBassContext = \translator {
+       \type "Engraver_group_engraver"
+       \name FiguredBass 
+       \consists "Figured_bass_engraver"       
+       \consistsend "Axis_group_engraver"
+}