release: 1.3.138

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index e3db961ceed47348c7821cfd8df3c81b6302982f..152aacde5b65db63804521c96369516c89e04a46 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -1,6 +1,6 @@
+\version "1.3.122"
 
-\version "1.3.110"
-       %
+%
 % setup for Request->Element conversion. Guru-only
 %
 
@@ -33,8 +33,6 @@ StaffContext=\translator {
        \consists "Local_key_engraver";
        \consists "Piano_pedal_engraver";
 
-       \consistsend "Axis_group_engraver";
-
 %{
        The Instrument_name_engraver puts the name of the instrument
        (\property Staff.instrument; Staff.instr for subsequent lines)
@@ -45,11 +43,20 @@ StaffContext=\translator {
        \consists "Instrument_name_engraver";
 %}
 
+       \consistsend "Axis_group_engraver";
 
          
        \accepts "Voice";
 }
 
+
+StaffContainerContext = \translator {
+       \type Engraver_group_engraver;
+       \consists "Axis_group_engraver";
+       \accepts Staff;
+       \name StaffContainer;
+}
+
 ChoirStaffContext = \translator {
        \type "Engraver_group_engraver";
        \name ChoirStaff;
@@ -97,11 +104,12 @@ VoiceContext = \translator {
        \name Voice;
 
        Generic_property_list = #generic-voice-properties
-       
+
+       % must come before all
+       \consists "Voice_devnull_engraver";
        \consists "Output_property_engraver";   
        \consists "Arpeggio_engraver";
 
-       \consists "Dynamic_engraver";   % must come before text_engraver.
        \consists "Text_spanner_engraver";
        \consists "Property_engraver";
        
@@ -113,18 +121,26 @@ VoiceContext = \translator {
        \consists "Auto_beam_engraver";
 
        \consists "Chord_tremolo_engraver";
+       \consists "Percent_repeat_engraver";
        \consists "Melisma_engraver";
+
+%{
+ Must come before text_engraver, but after note_column engraver.
+
+%}
+       \consists "Dynamic_engraver";
        \consists "Text_engraver";
-       \consists "A2_engraver";
-       \consists "Voice_devnull_engraver";
 
        \consists "Script_engraver";
        \consists "Script_column_engraver";
        \consists "Rhythmic_column_engraver";
+       \consists "Phrasing_slur_engraver";
        \consists "Slur_engraver";
        \consists "Tie_engraver";
        \consists "Tuplet_engraver";
        \consists "Grace_position_engraver";
+       \consists "A2_engraver";
+
        \consists "Skip_req_swallow_translator";
        \accepts Thread; % bug if you leave out this!
        \accepts Grace;
@@ -179,13 +195,14 @@ GraceContext=\translator {
 
 ThreadContext = \translator{
        \type Engraver_group_engraver;
+       \name Thread;
+       
        \consists "Thread_devnull_engraver";
        \consists "Note_heads_engraver";
        \consists "Note_head_line_engraver";
        \consists "Output_property_engraver";   
        Generic_property_list = #generic-thread-properties
        \consists "Property_engraver";
-       \name Thread;
 }
 
 GrandStaffContext=\translator{
@@ -268,15 +285,7 @@ LyricsContext = \translator {
        \accepts "LyricsVoice";
 }
 
-ChordNamesVoiceContext = \translator {
-       \type "Engraver_group_engraver";
-       \name ChordNamesVoice ;
 
-       \consists "Output_property_engraver";   
-       \consistsend "Axis_group_engraver";
-       \consists "Separating_line_group_engraver";
-       \consists "Chord_name_engraver";
-}
 ChordNamesContext = \translator {
        \type "Engraver_group_engraver";
        \name ChordNames;
@@ -285,19 +294,15 @@ ChordNamesContext = \translator {
 
        \consists "Property_engraver";  
        \consists "Output_property_engraver";   
-       \accepts "ChordNamesVoice";
+       \consists "Separating_line_group_engraver";
+       \consists "Chord_name_engraver";
+       \consists "Skip_req_swallow_translator";
+       \consistsend "Axis_group_engraver";
 
        VerticalAxisGroup \override #'invisible-staff = ##t
-       \consistsend "Axis_group_engraver";
        }
 
 
-ScoreWithNumbers = \translator {
-       \type "Score_engraver";
-
-       % uncomment to bar numbers on a whole system.
-       \consists "Bar_number_engraver";
-}
 
 StupidScore = \translator {
        \type "Score_engraver";
@@ -307,10 +312,6 @@ StupidScore = \translator {
 
 
 
-BarNumberingStaffContext = \translator {
-       \StaffContext
-       \consists "Mark_engraver";
-}
 
 HaraKiriStaffContext = \translator {
        \StaffContext
@@ -326,10 +327,8 @@ HaraKiriStaffContext = \translator {
   %\translator { \HaraKiriStaffContext }
 %}
 
-OrchestralPartStaffContext = \translator {
-       \StaffContext
-       \consists "Mark_engraver";
-}
+
+
 
 ScoreContext = \translator {
        \type Score_engraver;
@@ -349,8 +348,8 @@ ScoreContext = \translator {
        \consists "Bar_number_engraver";
        \consists "Span_arpeggio_engraver";
 
-       
-       \accepts "Staff";
+       \accepts "Staff";       
+       \accepts "StaffContainer";
        \accepts "StaffGroup";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
@@ -408,6 +407,8 @@ ScoreContext = \translator {
        pedalUnaChordaStrings = #'("una chorda" "" "tre chorde")
        pedalSostenutoStrings = #'()  % FIXME
 
+       tupletNumberFormatFunction = #denominator-tuplet-formatter
+       
        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)
@@ -432,4 +433,9 @@ ScoreContext = \translator {
 OrchestralScoreContext= \translator {
        \ScoreContext
 }
+EasyNotation =  \translator {
+       \ScoreContext
+       NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule
+       easyPlay = ##t
+}