From: fred <fred>
Date: Wed, 4 Dec 1996 23:07:29 +0000 (+0000)
Subject: lilypond-0.0.14
X-Git-Tag: release/1.5.59~6658
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b5fa85010077b1dde38b82eb53edf29a5e7bbe0e;p=lilypond.git

lilypond-0.0.14
---

diff --git a/maartje.ly b/maartje.ly
index c1dd45a689..5178885f0f 100644
--- a/maartje.ly
+++ b/maartje.ly
@@ -1,27 +1,27 @@
-ritme = rhythmstaff {
-	$
+ritme = staff {rhythmic
+	music {$
 	c8 c2 c2
 	%[c8( )'a8 c8 c8]
 	c2 c2
 	
 	[fis16 'dis16( fis16 'dis16 ][fis16) 'dis16 fis16 'dis16]
-	c2 r32 r32 r16 r8 r4 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 $
+	c2 r32 r32 r16 r8 r4 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 c2 $}
 }
 
 melody=
-melodicstaff {
-	$
+staff { melodic
+	music{$
 	c8
 	r1
 	'cis2..	r8
 	r4 r8 r16 r32 r32 
 
 	\duration {4}  \chord {
-		\voice { c () `bes c}
-		\voice {'fis ()'gisis fis }
-		\voice { d () d dis }
-		\voice {  a  () bes eis }
-		\voice { fis () g gis }
+		\music { c () `bes c}
+		\music { 'fis ()'gisis fis }
+		\music { d () d dis }
+		\music {  a  () bes eis }
+		\music { fis () g gis }
 	}
 	c4
 
@@ -30,10 +30,10 @@ melodicstaff {
 	a8 b8 'c8 'd8 ''c8 ```c8 c4 c4  c4 c4
 	\duration{ 16 } `b `a `g `f \duration{ 4}
 	c `b `a `g `f `e `d `c ``b ``a ``g ``f ``e ``d ``c
-	$
+	$}
 
-
-commands {
+	commands {
+	skip 0:0.125
 	skip 2:0
 	key $ fis cis gis $
 	skip 2:0
@@ -52,9 +52,8 @@ score {
 	staff { melody }
 %	staff { melody }
 	commands {
-		partial 0.125 skip 0:0.125
-
 		meter 4 4
+		partial 0.125 skip 0:0.125
 		skip 2:0		
 		meter 2 4
 		skip 19:0