X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Frhythm.ly;h=b67041034210cd7c1d1e398a2e03c0996f3a2f16;hb=c3e003dacb5689ffe384d3a2f2d5dc2afb9439bb;hp=368d04b9bf4a3b797a99c06cb813ec379d91eaed;hpb=389fcb53035ac07383abf597eb86c55e18d34891;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index 368d04b9bf..b670410342 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,66 +1,114 @@
-%
-% 	I've got rhythm!
-%
-% add any impressive examples here, please
+\header{
+filename =	 "rhythm.ly";
+enteredby =	 "HWN";
+copyright =	 "public domain";
+TestedFeatures =	 "multiple meters, beaming, unsynced bars, userdefd engravers";
+}
 
-ritme = staff {
-	melodic
 
-	music { $
-	c8					|
 
-	[a8() a8. a8 a16 a16 a16] c4.		|	% watch the beams!
+\version "0.1.9";
+
+ritme = \melodic{ %\octave ;
+	\partial 8;
+	\octave c';
+	\meter  4/4;
+	c8					|
+	
+	[a8~  a8. a8 a16 a16 a16] c4.		|	% watch the beams!
 	 r32 r32 r16 r8 r4 r2			|
-	\meter{  5*16}
+	\meter   5/16;
 
 	% divide measure in 5 equal parts. Usually it 2+3 or 3+2
-	\grouping { 5*16 }	
+	\grouping  16*5 ;	
 	[c8 c16 c8 ]				|	% watch THIS!
-	\plet{5/4} [c16 c16 c16 c16]\plet{1/1} |
-	\meter{  2*8}
+	 [5/4 c16 c16 c16 c16]1/1 |
+	\meter   2/8;
 	c4 				|
 	c4	c4	c4	c4
-	\meter {4*4}
+	\meter 4/4;
 	c1 c1 c1
 	
 %	[c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|	
 	
-	$ }
+	 }
+	
 
-	%
-	% The commands section takes the same stuff that music { } takes;
-	% the commands issued below could have been issued inside the above
-	% music block;
-	%
+another = 
+	\melodic{ \meter 4/4; 
+		c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+	 }
 
-	commands {	% override "commands" section of Score.
-		partial {1*8}	% doesn't have to be here. 
-		meter{ 4*4}
-	}
-}
-another = staff {
-	melodic
-	music { $
-		c1 c1 c1 c4 c4 c4 c4  \meter{ 4*4} c1 c1 c1
-	$ }
-}
 
-yanother = staff {
-	melodic
-	music { $
+yanother = 
+	\melodic{ \meter 4/4; 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
-	$ }
+	 }
+
+
+\score{
+	\type Staff_group <
+		\ritme
+		\another
+		\type Rhythmic_staff {
+			\yanother
+		}
+	>
+	
+	\paper{
+
+	%% remove Timing_engraver and Bar_number_engraver
+	Score = \translator {
+	\type Score_engraver;
+
+	%\consists "Timing_engraver";
+	%\consists "Bar_column_engraver";
+	%\consists "Bar_number_engraver";
+
+	\consists "Span_score_bar_engraver";
+	\consists "Score_priority_engraver";
+	\consists "Priority_horizontal_align_engraver";
+	\consists "Vertical_align_engraver";
+
+
+	\accepts "Staff_group";
+	\accepts "Staff";
+	\accepts "Lyrics";
+	\accepts "Grandstaff";
 }
 
-score {
-	staff{ritme}
-	staff { another }
-	staff { yanother }
-	commands { meter {4*4 }}
-	paper {
-		unitspace 2cm
-		geometric 1.3
+Rhythmic_staff = \translator
+{
+	  \type "Engraver_group_engraver";
+	nolines  = "1";
+	  \consists "Pitch_squash_engraver";
+
+	  \consists "Bar_engraver";
+	  \consists "Meter_engraver";
+	  \consists "Staff_sym_engraver";
+	  \consists "Line_group_engraver";
+	  \consists "Timing_engraver";
+	  \accepts "Voice";
+}
+	%% add Timing_engraver to the staff
+	Staff = \translator {
+	  \type "Engraver_group_engraver";
+	defaultclef=	violin;
+
+	\consists "Timing_engraver";
+	  \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";
+	}
 	}
 }