release: 1.1.15

[lilypond.git] / init / engraver.ly

diff --git a/init/engraver.ly b/init/engraver.ly
index 2921a518c53e7e99f6efb59b02f3023256b5a007..044beade24918b03fcbcbb7804cca4f8befbcd03 100644 (file)
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -4,7 +4,7 @@
 
 StaffContext=\translator {
        \type "Line_group_engraver_group";
-       Staff ;
+       \name Staff ;
 
 %{
        The Hara_kiri_line_group_engraver is a Line_group_engraver 
@@ -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";
 
@@ -58,13 +61,14 @@ StaffContext=\translator {
 \translator{\StaffContext }
 \translator {
        \type "Line_group_engraver_group";
-       ChoirStaff;
+       \name ChoirStaff;
        \consists "Vertical_align_engraver";
        \consists "Staff_group_bar_engraver";
        \accepts "Staff";
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 
@@ -73,45 +77,50 @@ RhythmicStaffContext=\translator{
        nolines  = "1";
        \consists "Pitch_squash_engraver";
        \consists "Separating_line_group_engraver";     
-       RhythmicStaff;
+       \name RhythmicStaff;
+
+       \consists "Repeat_engraver";
        \consists "Bar_engraver";
        \consists "Time_signature_engraver";
-       \consists "Staff_sym_engraver";
+       \consists "Staff_symbol_engraver";
        \accepts "Voice";
 };
 \translator{\RhythmicStaffContext}
 VoiceContext = \translator {
        \type "Engraver_group_engraver";
        \consists "Dynamic_engraver";
-       Voice ;
+       \name Voice ;
        
        \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";
-       GrandStaff;
+       \name GrandStaff;
        \consists "Span_bar_engraver";
        \consists "Vertical_align_engraver";
        \consists "Piano_bar_engraver";
        minVerticalAlign = 1.5*\staffheight;
 
        \accepts "Staff";
-}
+};
+\translator{\GrandStaffContext}
 
 \translator {
        \type "Line_group_engraver_group";
@@ -119,33 +128,51 @@ VoiceContext = \translator {
        \consists "Span_bar_engraver";
        \consists "Vertical_align_engraver";
        \consists "Staff_group_bar_engraver";
-       StaffGroup;
+       \name StaffGroup;
        \accepts "Staff";
        \accepts "RhythmicStaff";
        \accepts "GrandStaff";
        \accepts "Lyrics";
+       \accepts "ChordNames";
 }
 
 \translator{
        \type "Line_group_engraver_group";
 
-       LyricVoice ;
+       \name LyricVoice ;
        \consists "Separating_line_group_engraver";
        \consists "Lyric_engraver";
+       \consists "Extender_engraver";
        \consists "Beam_req_swallow_translator";
        \consists "Plet_swallow_engraver";
 }
 
 \translator {
        \type "Line_group_engraver_group";
-       Lyrics;
+       \name Lyrics;
        \consists "Vertical_align_engraver";
        \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;
-       Score;
+       \name Score;
+
        \consists "Timing_engraver";
 
        \consists "Bar_column_engraver";
@@ -159,6 +186,7 @@ ScoreContext = \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
        \accepts "ChoirStaff";
 };
@@ -173,21 +201,17 @@ ScoreWithNumbers = \translator {
 
 };
 
-\translator {
+StupidScore = \translator {
        \type "Score_engraver";
-       StupidScore;
-
-       \consists "Staff_sym_engraver";
-}
+       \name Score;
+       \consists "Note_heads_engraver";
+};
 
 
 
 BarNumberingStaffContext = \translator {
        \StaffContext
-
-
        barColumnPriority = "0";
-
        marginBreakPriority = "-4";
        \consists "Mark_engraver";
        \consists "Bar_column_engraver";
@@ -198,17 +222,17 @@ BarNumberingStaffContext = \translator {
 
 HaraKiriStaffContext = \translator {
        \type "Hara_kiri_line_group_engraver";
-       Staff;
-       defaultclef = violin;
+       \name Staff;
        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";
@@ -217,15 +241,29 @@ HaraKiriStaffContext = \translator {
        \accepts "Voice";
 };
 
+% huh, Score should do HaraKiri, not Part yes?
+OrchestralPartStaffContext = \translator {
+%      \HaraKiriStaffContext
+       \StaffContext
+       barColumnPriority = "0";
+       marginBreakPriority = "-4";
+       \consists "Mark_engraver";
+       \consists "Bar_column_engraver";
+       \consists "Bar_number_engraver";
+};
+
+% where to put HaraKiri here?
 OrchestralScoreContext= \translator {
        \type Score_engraver;
-       Score;
+       \name Score;
        barScriptPadding = "2.0";       % dimension \pt
        markScriptPadding = "4.0";
        barColumnPriority = "-4";
        markBreakPriority = "-4";
+       defaultClef = treble;
 
        \consists "Timing_engraver";
+
        \consists "Bar_column_engraver";
        \consists "Bar_number_engraver";
        \consists "Mark_engraver";
@@ -239,5 +277,6 @@ OrchestralScoreContext= \translator {
        \accepts "Staff";
        \accepts "RhythmicStaff";       
        \accepts "Lyrics";
+       \accepts "ChordNames";
        \accepts "GrandStaff";
 };