X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Frhythm.ly;h=28cded36a608902b587aa9bfb3d2dbbefe588935;hb=61c4b07cddc6231c3ca4b45a0aa86d27e25110b9;hp=c74c9d8dcd69f66e587b81224b05c6aa81bf7a6b;hpb=47c90cd333d91fce969d1933fc8222ab9d23246c;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index c74c9d8dcd..28cded36a6 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,60 +1,75 @@
-%
-% 	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 "1.1.66";
+
+ritme = \notes\transpose c'' {
+	\time  4/4;
+	\partial 8;
+	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 { 5*16 }	
+		
 	[c8 c16 c8 ]				|	% watch THIS!
-	\plet{5/4} [c16 c16 c16 c16]\plet{1/1} |
-	\meter{  2*8}
+	 \times 5/4 { [ c16 c16 c16 c16] } |
+	\time   2/8;
 	c4 				|
 	c4	c4	c4	c4
-	\meter {4*4}
+	\time 4/4;
 	c1 c1 c1
 	
 %	[c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|
 %	[c16 c16 c16 c16 c16 ]			|	
 	
-	$ }
+	 }
+	
+
+another = 
+	\notes \relative c'' { \time 6/4; 
+		c1.  c1. \time 4/4;c4 c4 c4 c4  c1 c1 c1
+	 }
 
-	commands {	% override "commands" section of Score.
-		partial 1*8
-		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 = 
+	\notes{ \time 4/4; 
 		c1 c1 c1 c4 c4 c4 c4  c1 c1 c1
-	$ }
-}
+	 }
+
 
-score {
-	staff{ritme}
-	staff { another }
-	staff { yanother }
-	commands { meter {4*4 }}
-	paper {
-		unitspace 2cm
-		geometric 1.3
+\score{
+	\context StaffGroup <
+		\ritme
+		\another
+		\context RhythmicStaff {
+			\yanother
+		}
+	>
+	
+	\paper{
+
+	%% remove Timing_engraver and Bar_number_engraver
+ \translator {
+ \ScoreContext
+ \remove "Timing_engraver";
+  }
+  \translator {
+  \RhythmicStaffContext
+  \consists "Timing_engraver";
+  }
+  \translator{
+  \StaffContext
+  \consists "Timing_engraver";
+  }
 	}
-}
\ No newline at end of file
+}