X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=init%2Fengraver.ly;h=010e47dae06b23818c93a9cb1849ad4939860142;hb=55fa3168d0fb5326341ff56d7a1638c89eb2ebaf;hp=e8869c0de93cd3740fd23cfb30ad638bf152668f;hpb=1bdf3db27451a0873b2c97545f0beab2f5cce06a;p=lilypond.git

diff --git a/init/engraver.ly b/init/engraver.ly
index e8869c0de9..010e47dae0 100644
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -3,100 +3,163 @@
 %
 
 Staff = \translator {
-	  \type "Engraver_group_engraver";
+	\type "Line_group_engraver_group";
+%{
+	The Hara_kiri_line_group_engraver is a Line_group_engraver 
+	that will not typeset an empty line of staff, i.e., a line 
+	of staff with only rests in it.  This is needed for orchestral
+	scores.  Comment-out Line_group_engraver_group, and uncomment 
+	Hara_kiri_line_group_engraver.
+%}
+%	\type "Hara_kiri_line_group_engraver";
 	defaultclef = violin;
 
-	  \consists "Bar_engraver";
-	  \consists "Clef_engraver";
-	  \consists "Key_engraver";
-	  \consists "Meter_engraver";
-	  \consists "Local_key_engraver";
-	  \consists "Staff_sym_engraver";
-	  \consists "Collision_engraver";
-	  \consists "Rest_collision_engraver";
-
-	  \consists "Line_group_engraver";
-	  \accepts "Voice";
+	\consists "Bar_engraver";
+	\consists "Clef_engraver";
+	\consists "Key_engraver";
+	\consists "Local_key_engraver";
+	\consists "Time_signature_engraver";
+	\consists "Staff_sym_engraver";
+	\consists "Collision_engraver";
+	\consists "Rest_collision_engraver";
+%{
+	Uncomment to get bar numbers on single staff systems:
+	
+	The Bar_number_engraver puts a number over a staff created
+	at the same level of hierarchy.  This why you have to add it
+	here separately if you want to have numbers on single staff
+	systems: The Bar_number_engraver in Score_engraver will only
+	put numbers on bars that are Score ("system") wide.  Such
+	bars are only created when the toplevel system has multiple
+	children-staffs.
+
+%}
+%{
+	\consists "Bar_column_engraver";
+	\consists "Bar_number_engraver";
+%}
+%{
+	The Staff_margin_engraver puts the name of the instrument
+	(\property Staff.instrument; Staff.instr for subsequent lines)
+	to the left of a staff.
+%}
+%{
+	\consists "Staff_margin_engraver";
+%}
+	\consists "Separating_line_group_engraver";
+	  
+	\accepts "Voice";
+}
+ChoireStaff = \translator {
+	\type "Line_group_engraver_group";
+	\consists "Vertical_align_engraver";
+	\consists "Staff_group_bar_engraver";
+	\accepts "Staff";
+	\accepts "RhythmicStaff";
+	\accepts "GrandStaff";
+	\accepts "Lyrics";
+}
+
+
+RhythmicStaff = \translator
+{
+	\type "Line_group_engraver_group";
+	nolines  = "1";
+	\consists "Pitch_squash_engraver";
+
+	\consists "Bar_engraver";
+	\consists "Time_signature_engraver";
+	\consists "Staff_sym_engraver";
+	\accepts "Voice";
 }
 
 Voice = \translator {
 	\type "Engraver_group_engraver";
 	\consists "Dynamic_engraver";
  	\consists "Rest_engraver";
+	\consists "Dot_column_engraver";
 	\consists "Stem_engraver";
+	\consists "Plet_engraver";
 	\consists "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";
-	\accepts "Thread";
-}
-
-Thread = \translator {
-	\type "Engraver_group_engraver";
+	\consists "Ties_engraver";
+	\consists "Note_heads_engraver" ;	
 	\consists "Skip_req_swallow_translator";
-	\consists "Note_head_engraver" ;
-	\consists "Tie_engraver";
+	%\accepts "Thread";
 }
 
-Grandstaff = \translator {
-	\type "Engraver_group_engraver";
+
+GrandStaff = \translator {
+	\type "Line_group_engraver_group";
 
 	\consists "Span_bar_engraver";
 	\consists "Vertical_align_engraver";
 	\consists "Piano_bar_engraver";
+	minVerticalAlign = 1.5*\staffheight;
 
 	% This should come last
-	\consists "Line_group_engraver";
 	\accepts "Staff";
 }
 
-Staff_group = \translator {
-	\type "Engraver_group_engraver";
+StaffGroup = \translator {
+	\type "Line_group_engraver_group";
+%	\type "Hara_kiri_line_group_engraver";
 	\consists "Span_bar_engraver";
 	\consists "Vertical_align_engraver";
-	\consists "Line_group_engraver";
+	\consists "Staff_group_bar_engraver";
+
 	\accepts "Staff";
-	\accepts "Grandstaff";
+	\accepts "RhythmicStaff";
+	\accepts "GrandStaff";
 	\accepts "Lyrics";
 }
 
-Lyric_voice = 
+LyricVoice = 
 \translator{
-	\type "Engraver_group_engraver";
+	\type "Line_group_engraver_group";
 
+	\consists "Separating_line_group_engraver";
 	\consists "Lyric_engraver";
-	\consists "Line_group_engraver";
 	\consists "Beam_req_swallow_translator";
+	\consists "Plet_swallow_engraver";
 }
 
 Lyrics = \translator {
-	\type "Engraver_group_engraver";
+	\type "Line_group_engraver_group";
 	\consists "Vertical_align_engraver";
-	\consists "Line_group_engraver";
-	\accepts "Lyric_voice";
+	\accepts "LyricVoice";
 }
 
 Score = \translator {
 	\type Score_engraver;
 
 	\consists "Timing_engraver";
-	%\consists "Bar_column_engraver";
-	%\consists "Bar_number_engraver";
-
+	% uncomment to bar numbers on a whole system.
+%{
+	\consists "Bar_column_engraver";
+	\consists "Bar_number_engraver";
+%}
+	\consists "Bar_column_engraver";
 	\consists "Span_score_bar_engraver";
 	\consists "Score_priority_engraver";
 	\consists "Priority_horizontal_align_engraver";
 	\consists "Vertical_align_engraver";
 
 
-	\accepts "Staff_group";
+	\accepts "StaffGroup";
 	\accepts "Staff";
+	\accepts "RhythmicStaff";	
 	\accepts "Lyrics";
-	\accepts "Grandstaff";
+	\accepts "GrandStaff";
+	\accepts "ChoireStaff";
 }
 
-Stupid_score = \translator {
+StupidScore = \translator {
 	\type Score_engraver;
 	\consists "Staff_sym_engraver";
 }