X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Frhythm.ly;h=a3217d5daf82de15227c1d91dd0160c389d2694c;hb=91629326e2c28dab86952c2abbe786978b7c1e92;hp=b0e2e1cd66b9c0f7aaedf922562e1423300cf55e;hpb=151617937a431d3db3e94a16db011600acdb4288;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index b0e2e1cd66..a3217d5daf 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -7,12 +7,11 @@ TestedFeatures =	 "multiple meters, beaming, unsynced bars, userdefd engravers";
 
 
 
-\version "1.0.3";
+\version "1.1.52";
 
 ritme = \notes\transpose c'' {
-	\partial 8;
-
 	\time  4/4;
+	\partial 8;
 	c8					|
 	
 	[a8~  a8. a8 a16 a16 a16] c4.		|	% watch the beams!
@@ -20,9 +19,9 @@ ritme = \notes\transpose c'' {
 	\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 |
+	 \times 5/4 { [ c16 c16 c16 c16] } |
 	\time   2/8;
 	c4 				|
 	c4	c4	c4	c4
@@ -37,8 +36,8 @@ ritme = \notes\transpose c'' {
 	
 
 another = 
-	\notes{ \time 4/4; 
-		c1.  c1. c4 c4 c4 c4  \time  4/4; c1 c1 c1
+	\notes \relative c'' { \time 6/4; 
+		c1.  c1. \time 4/4;c4 c4 c4 c4  c1 c1 c1
 	 }
 
 
@@ -49,10 +48,10 @@ yanother =
 
 
 \score{
-	\type StaffGroup <
+	\context StaffGroup <
 		\ritme
 		\another
-		\type RhythmicStaff {
+		\context RhythmicStaff {
 			\yanother
 		}
 	>
@@ -60,57 +59,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 "StaffGroup";
-	\accepts "Staff";
-	\accepts "Lyrics";
-	\accepts "GrandStaff";
-}
-
-RhythmicStaff = \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";
+  }
 	}
 }