release: 1.1.15

[lilypond.git] / init / engraver.ly

diff --git a/init/engraver.ly b/init/engraver.ly
index be324756689ace5695f6d3a05756a56cc0aea594..044beade24918b03fcbcbb7804cca4f8befbcd03 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -15,14 +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 "Staff_sym_engraver";
+       \consists "Staff_symbol_engraver";
        \consists "Collision_engraver";
        \consists "Rest_collision_engraver";
+
 %{
        Uncomment to get bar numbers on single staff systems:
        
@@ -44,6 +46,7 @@ StaffContext=\translator {
        (\property Staff.instrument; Staff.instr for subsequent lines)
        to the left of a staff.
 %}
+       defaultClef = treble;
 
        marginBreakPriority = "-5";
 
@@ -65,6 +68,7 @@ StaffContext=\translator {
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 
@@ -74,9 +78,11 @@ RhythmicStaffContext=\translator{
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
        \name RhythmicStaff;
+
+       \consists "Repeat_engraver";
        \consists "Bar_engraver";
        \consists "Time_signature_engraver";
-       \consists "Staff_sym_engraver";
+       \consists "Staff_symbol_engraver";
        \accepts "Voice";
 };
 \translator{\RhythmicStaffContext}
@@ -88,21 +94,23 @@ VoiceContext = \translator {
        \consists "Rest_engraver";
        \consists "Dot_column_engraver";
        \consists "Stem_engraver";
-       \consists "Plet_engraver";
-       \consists "Beam_engraver";
+%      \consists "Plet_engraver";
+       \consists "Command_beam_engraver";
        \consists "Abbreviation_beam_engraver";
        \consists "Multi_measure_rest_engraver";
        \consists "Script_engraver";
        \consists "Rhythmic_column_engraver";
        \consists "Font_size_engraver";
        \consists "Slur_engraver";
-       \consists "Ties_engraver";
+       \consists "Command_tie_engraver";
+       \consists "Tuplet_engraver";    
        \consists "Note_heads_engraver" ;       
        \consists "Skip_req_swallow_translator";
 };
 
 \translator {\VoiceContext}
-\translator {
+
+GrandStaffContext=\translator{
        \type "Line_group_engraver_group";
        \name GrandStaff;
        \consists "Span_bar_engraver";
@@ -111,7 +119,8 @@ VoiceContext = \translator {
        minVerticalAlign = 1.5*\staffheight;
 
        \accepts "Staff";
-}
+};
+\translator{\GrandStaffContext}
 
 \translator {
        \type "Line_group_engraver_group";
@@ -124,6 +133,7 @@ VoiceContext = \translator {
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 \translator{
@@ -132,6 +142,7 @@ VoiceContext = \translator {
        \name LyricVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
+       \consists "Extender_engraver";
        \consists "Beam_req_swallow_translator";
        \consists "Plet_swallow_engraver";
 }
@@ -143,10 +154,24 @@ VoiceContext = \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;
-       defaultClef = violin;
 
        \consists "Timing_engraver";
 
@@ -161,6 +186,7 @@ ScoreContext = \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
        \accepts "ChoirStaff";
 };
@@ -175,12 +201,11 @@ ScoreWithNumbers = \translator {
 
 };
 
-\translator {
+StupidScore = \translator {
        \type "Score_engraver";
-       \name StupidScore;
-
-       \consists "Staff_sym_engraver";
-}
+       \name Score;
+       \consists "Note_heads_engraver";
+};
 
 
 
@@ -201,12 +226,13 @@ HaraKiriStaffContext = \translator {
        barColumnPriority = "0";
        marginBreakPriority = "-4";
 
+       \consists "Repeat_engraver";
        \consists "Bar_engraver";
        \consists "Clef_engraver";
        \consists "Key_engraver";
        \consists "Time_signature_engraver";
        \consists "Local_key_engraver";
-       \consists "Staff_sym_engraver";
+       \consists "Staff_symbol_engraver";
        \consists "Collision_engraver";
        \consists "Rest_collision_engraver";
        \consists "Staff_margin_engraver";
@@ -215,8 +241,10 @@ HaraKiriStaffContext = \translator {
        \accepts "Voice";
 };
 
+% huh, Score should do HaraKiri, not Part yes?
 OrchestralPartStaffContext = \translator {
-       \HaraKiriStaffContext
+%      \HaraKiriStaffContext
+       \StaffContext
        barColumnPriority = "0";
        marginBreakPriority = "-4";
        \consists "Mark_engraver";
@@ -224,6 +252,7 @@ OrchestralPartStaffContext = \translator {
        \consists "Bar_number_engraver";
 };
 
+% where to put HaraKiri here?
 OrchestralScoreContext= \translator {
        \type Score_engraver;
        \name Score;
@@ -231,9 +260,10 @@ OrchestralScoreContext= \translator {
        markScriptPadding = "4.0";
        barColumnPriority = "-4";
        markBreakPriority = "-4";
-       defaultClef = violin;
+       defaultClef = treble;
 
        \consists "Timing_engraver";
+
        \consists "Bar_column_engraver";
        \consists "Bar_number_engraver";
        \consists "Mark_engraver";
@@ -247,5 +277,6 @@ OrchestralScoreContext= \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
 };