X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Frhythm.ly;h=75558c339a09cabbf272052ae4f2d0faa45c70db;hb=9f88b957750d767f2230004a4bf2d4eccca7decf;hp=e0a019dbbf9aabe661133922b7a83a2a61b3afe5;hpb=6bc0a8a090e82c4bce57df8e980b48cc78cb422b;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index e0a019dbbf..75558c339a 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,26 +7,25 @@ TestedFeatures =	 "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "0.1.15";
+\version "1.0.7";
 
-ritme = \melodic{ %\octave ;
+ritme = \notes\transpose c'' {
+	\time  4/4;
 	\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;
+	\time   5/16;
 
 	% divide measure in 5 equal parts. Usually it 2+3 or 3+2
 	\grouping  16*5 ;	
 	[c8 c16 c8 ]				|	% watch THIS!
 	 [5/4 c16 c16 c16 c16]1/1 |
-	\meter   2/8;
+	\time   2/8;
 	c4 				|
 	c4	c4	c4	c4
-	\meter 4/4;
+	\time 4/4;
 	c1 c1 c1
 	
 %	[c16 c16 c16 c16 ]			|
@@ -37,22 +36,26 @@ ritme = \melodic{ %\octave ;
 	
 
 another = 
-	\melodic{ \meter 4/4; 
-		c1.  c1. c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+	\notes{ \time 6/4; 
+		c1.  c1. \time 4/4;c4 c4 c4 c4  c1 c1 c1
 	 }
 
 
+%
+% Beams are incorrect for the next staff.  They cut through the whole notes.
+%
+
 yanother = 
-	\melodic{ \meter 4/4; 
+	\notes{ \time 4/4; 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
 	 }
 
 
 \score{
-	\type Staff_group <
+	\type StaffGroup <
 		\ritme
 		\another
-		\type Rhythmic_staff {
+		\type RhythmicStaff {
 			\yanother
 		}
 	>
@@ -60,57 +63,17 @@ yanother =
 	\paper{
 
 	%% remove Timing_engraver and Bar_number_engraver
-	Score = \translator {
-	\type Score_engraver;
-
-	%\consists "Timing_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 "Grand_staff";
-}
-
-Rhythmic_staff = \translator
-{
-	  \type "Engraver_group_engraver";
-	nolines  = "1";
-	  \consists "Pitch_squash_engraver";
-
-	\consists "Bar_column_engraver";
-	\consists "Bar_number_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 "Bar_column_engraver";
-	\consists "Bar_number_engraver";
-	\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";
-	}
+ \translator {
+ \ScoreContext
+ \remove "Timing_engraver";
+  }
+  \translator {
+  \RhythmicStaffContext
+  \consists "Timing_engraver";
+  }
+  \translator{
+  \StaffContext
+  \consists "Timing_engraver";
+  }
 	}
 }