release: 1.5.37

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

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 6261811a13244229551ed15f5fa5ca89533f5348..1552a368960b539189a68796c6bafbd02e67f0e3 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "1.3.146"
+\version "1.5.33"
 
 %
 % setup for Request->Element conversion. Guru-only
@@ -18,8 +18,9 @@ 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 "Dot_column_engraver"
 
        \consists "Clef_engraver"
        \consists "Key_engraver"
@@ -27,9 +28,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"
        
@@ -64,7 +66,7 @@ InnerChoirStaffContext = \translator {
        \name InnerChoirStaff
        alignmentReference = #0
        \consists "System_start_delimiter_engraver"
-       SystemStartDelimiter = #'SystemStartBracket
+       systemStartDelimiter = #'SystemStartBracket
 
        \accepts "Staff"
        \accepts "RhythmicStaff"
@@ -127,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"
@@ -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"
@@ -176,7 +178,7 @@ GrandStaffContext=\translator{
        \consists "Span_bar_engraver"
        \consists "Span_arpeggio_engraver"
        \consists "System_start_delimiter_engraver"
-       SystemStartDelimiter = #'SystemStartBrace
+       systemStartDelimiter = #'SystemStartBrace
        Generic_property_list = #generic-grand-staff-properties
        \accepts "Staff"
 }
@@ -188,8 +190,8 @@ PianoStaffContext = \translator{
        \consists "Vertical_align_engraver"
        \consists "Instrument_name_engraver"
        
-       instrument = ##f
-       instr = ##f
+       instrument = #'()
+       instr = #'()
        
        verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback
        VerticalAlignment \override #'forced-distance = #12
@@ -204,7 +206,7 @@ InnerStaffGroupContext= \translator {
        \consists "Span_bar_engraver"
        \consists "Span_arpeggio_engraver"
        \consists "Output_property_engraver"    
-       SystemStartDelimiter = #'SystemStartBracket
+       systemStartDelimiter = #'SystemStartBracket
 
        \consists "System_start_delimiter_engraver"
        \accepts "Staff"
@@ -238,6 +240,7 @@ LyricsVoiceContext= \translator{
        \consists "Extender_engraver"
        \consists "Hyphen_engraver"
        \consists "Stanza_number_engraver"
+       \consists "Skip_req_swallow_translator"
        phrasingPunctuation = #".,:!?\""
        
 }
@@ -322,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"
@@ -351,9 +355,9 @@ ScoreContext = \translator {
        soloADue = ##t
        splitInterval = #'(0 . 1)
        changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512))
-       SystemStartDelimiter =#'SystemStartBar
-       barAuto = ##t
-       voltaVisibility = ##t
+       systemStartDelimiter =#'SystemStartBar
+
+
        %  name, glyph id, clef position 
        % where is c0 in this clef?
 
@@ -362,7 +366,7 @@ ScoreContext = \translator {
        centralCPosition = #-6
        
         automaticPhrasing = ##t
-       alignmentReference = #-1   % \down
+
        defaultBarType = #"|"
 
        explicitClefVisibility = #all-visible
@@ -379,6 +383,12 @@ 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)
@@ -386,15 +396,15 @@ ScoreContext = \translator {
          (3  . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2)
         )
        breakAlignOrder = #'(
-         Instrument_name
-         Left_edge_item
-         Span_bar
-         Breathing_sign
-         Clef_item
-         Key_item
-         Staff_bar
-         Time_signature
-         Custos
+         instrument-name
+         left-edge
+         span-bar
+         breathing-sign
+         clef
+         key-signature
+         staff-bar
+         time-signature
+         custos
        )
 
 
@@ -407,7 +417,6 @@ OrchestralScoreContext= \translator {
 EasyNotation =  \translator {
        \ScoreContext
        NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule
-       easyPlay = ##t
 }
 
 % retain for compatibility reasons (FIXME: convert-ly)