X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Frhythm.ly;h=c76a1ee0cd303cf3f24bf77b4d14e0d1b2defd5b;hb=7f0a3b682bebc864fbca295deba301238d805274;hp=c74c9d8dcd69f66e587b81224b05c6aa81bf7a6b;hpb=47c90cd333d91fce969d1933fc8222ab9d23246c;p=lilypond.git

diff --git a/input/rhythm.ly b/input/rhythm.ly
index c74c9d8dcd..c76a1ee0cd 100644
--- a/input/rhythm.ly
+++ b/input/rhythm.ly
@@ -1,60 +1,57 @@
 %
-% 	I've got rhythm!
+% 	Ive' got rhythm!
 %
 % add any impressive examples here, please
 
-ritme = staff {
-	melodic
-
-	music { $
+ritme = \staff {
+	melodicregs
+	\melodic{ %\octave ;
+	\partial 8;
+	\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}
+	 [c16 c16 c16 c16]5/4 |
+	\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 ]			|	
 	
-	$ }
-
-	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
-	$ }
+another = \staff {
+	melodicregs
+	\melodic{ \meter 4/4; 
+		c1 c1 c1 c4 c4 c4 c4  \meter  4/4; c1 c1 c1
+	 }
 }
 
-yanother = staff {
-	melodic
-	music { $
+yanother = \staff 	{ 
+	melodicregs
+	\melodic{ \meter 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{
+	ritme
+	another
+	yanother
+	
+	\paper{
+		\unitspace 2\cm
+		\geometric 1.3
 	}
-}
\ No newline at end of file
+}