release: 1.1.13

[lilypond.git] / init / engraver.ly

diff --git a/init/engraver.ly b/init/engraver.ly
index 81f5312937732f34714964b6bbbfa4aa82175121..a7c13b6bbc23b12d0e81b50099d0725d1f8a38e5 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -15,16 +15,16 @@ StaffContext=\translator {
 %}
 %      \type "Hara_kiri_line_group_engraver";
 
+       \consists "Repeat_engraver";
        \consists "Bar_engraver";
        \consists "Clef_engraver";
        \consists "Key_engraver";
        \consists "Local_key_engraver";
        \consists "Time_signature_engraver";
-       \consists "Repeat_engraver";
        \consists "Staff_symbol_engraver";
        \consists "Collision_engraver";
        \consists "Rest_collision_engraver";
-       \consists "Tuplet_engraver";
+
 %{
        Uncomment to get bar numbers on single staff systems:
        
@@ -68,6 +68,7 @@ StaffContext=\translator {
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 
@@ -77,8 +78,9 @@ RhythmicStaffContext=\translator{
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
        \name RhythmicStaff;
-       \consists "Bar_engraver";
+
        \consists "Repeat_engraver";
+       \consists "Bar_engraver";
        \consists "Time_signature_engraver";
        \consists "Staff_symbol_engraver";
        \accepts "Voice";
@@ -101,6 +103,7 @@ VoiceContext = \translator {
        \consists "Font_size_engraver";
        \consists "Slur_engraver";
        \consists "Ties_engraver";
+       \consists "Tuplet_engraver";    
        \consists "Note_heads_engraver" ;       
        \consists "Skip_req_swallow_translator";
 };
@@ -130,6 +133,7 @@ GrandStaffContext=\translator{
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 \translator{
@@ -150,6 +154,21 @@ GrandStaffContext=\translator{
        \accepts "LyricVoice";
 }
 
+\translator{
+       \type "Line_group_engraver_group";
+
+       \name ChordNameVoice ;
+       \consists "Separating_line_group_engraver";
+       \consists "Chord_name_engraver";
+}
+
+\translator {
+       \type "Line_group_engraver_group";
+       \name ChordNames;
+       \consists "Vertical_align_engraver";
+       \accepts "ChordNameVoice";
+}
+
 ScoreContext = \translator {
        \type Score_engraver;
        \name Score;
@@ -167,6 +186,7 @@ ScoreContext = \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
        \accepts "ChoirStaff";
 };
@@ -206,9 +226,9 @@ HaraKiriStaffContext = \translator {
        barColumnPriority = "0";
        marginBreakPriority = "-4";
 
+       \consists "Repeat_engraver";
        \consists "Bar_engraver";
        \consists "Clef_engraver";
-       \consists "Repeat_engraver";
        \consists "Key_engraver";
        \consists "Time_signature_engraver";
        \consists "Local_key_engraver";
@@ -243,6 +263,7 @@ OrchestralScoreContext= \translator {
        defaultClef = treble;
 
        \consists "Timing_engraver";
+
        \consists "Bar_column_engraver";
        \consists "Bar_number_engraver";
        \consists "Mark_engraver";
@@ -256,5 +277,6 @@ OrchestralScoreContext= \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
 };