X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=mutopia%2FJ.S.Bach%2Fwtk1-prelude1.ly;h=6c4a53559e35ef563196ff3aff41b3608591cd8d;hb=b0e071d2c80e4445c2a4710d0658ab26e1131bd4;hp=179e70471b514a53061b5b9345b0eaab4a76736b;hpb=151617937a431d3db3e94a16db011600acdb4288;p=lilypond.git

diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly
index 179e70471b..6c4a53559e 100644
--- a/mutopia/J.S.Bach/wtk1-prelude1.ly
+++ b/mutopia/J.S.Bach/wtk1-prelude1.ly
@@ -1,30 +1,32 @@
 \header{
-filename =	 "prelude1.ly";
 title =	 "Preludium";
-description =	 "Das Wohltemperierte Clavier I, Prelude I (c-major)";
 opus =	 "BWV 846";
 composer =	 "Johann Sebastian Bach (1685-1750)";
 enteredby =	 "Shay Rojansky";
-copyright =	 "Public Domain";
-}
 
-\version "1.0.3";
 
-global = 
-    \notes {
-	 \time 4/4;                % should be \time C
-    }
-  
+  % mutopia headers.
+  mutopiatitle = "Das Wohltemperierte Clavier I, Prelude 1 (c-major)";
+  mutopiacomposer = "J.S.Bach";
+  mutopiaopus = "BWV846";
+  style = "baroque";
+  copyright =    "\\\\This music is part of the Mutopia project, http://sca.uwaterloo.ca/Mutopia/\\\\It has been typeset and placed in the public domain by Han-Wen Nienhuys.\\\\Unrestricted modification and redistribution is permitted and encouraged - copy this music and share it!";
+  maintainer = "hanwen@cs.uu.nl";
+  lastupdated = "1999/Oct/14";
+}
 
-% should do programmable input.
+\version "1.3.4";
 
+% should do programmable input.
 soprane =
     \notes \transpose c'' {
+	\context Staff <
+	% Real soprane
+	\context Voice = uVoice {
+	\time 4/4;
         \clef "violin";
 
-	\type Staff <
-	% Real soprane
-	{\stemup
+	\stemup
 	r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] |
 	r8 [a16 d'] [f' a d' f'] r8 [a16 d'] [f' a d' f'] |
 	r8 [g16 d'] [f' g d' f'] r8 [g16 d'] [f' g d' f'] |
@@ -33,9 +35,9 @@ soprane =
 	r8 [fis16 a] [d' fis a d'] r8 [fis16 a] [d' fis a d'] |
 	r8 [g16 d'] [g' g d' g'] r8 [g16 d'] [g' g d' g'] |
 	r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] |
-	r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] |}
+	r8 [e16 g] [c' e g c'] r8 [e16 g] [c' e g c'] }
 	% Tenor
-	{\stemdown
+	\context Voice = dVoice {\stemdown
 	r16 e8. ~ e4 r16 e8. ~ e4 |
 	r16 d8. ~ d4 r16 d8. ~ d4 |
 	r16 d8. ~ d4 r16 d8. ~ d4 |
@@ -74,7 +76,7 @@ soprane =
 
 	r8 [f,16 a,] [c f c a,] [c a, f, a,] [f, d, f, d,] |
 	r8 [g16 b] [d' f' d' b] [d' b g b] [d f e d] |
-	<e1 g c'> ||
+	<e1 g c'> \bar "|.";
     }
 
 bass =
@@ -93,8 +95,8 @@ bass =
 	b b |
 	a a |	
 %% 10
-	\type Staff <
-	% Alt
+	\context Staff <
+	\context Voice =  Alt
 	{\stemup
 	r16 a8. ~ a4 r16 a8. ~ a4 |
 	r16 b8. ~ b4 r16 b8. ~ b4 |
@@ -126,7 +128,7 @@ bass =
 	r16 b,8. ~ b,4 ~ b,2 |
 	c1 ||}
 
-	% Bass
+	\context Voice = Bass
 	{\stemdown
 	d2 d |
 	g g |
@@ -156,28 +158,19 @@ bass =
 	
 	c, c, |
 	c, c, |
-	c,1 }>
+	c,1 \bar "|."; }>
     }
 
         
 \score {
-    \notes \type GrandStaff < 
-                  <
-                       \global 
-                       \soprane
-                 >
-                  <
-                       \global
-		       \bass
-                 >
-             >
-
-    \paper{
-	gourlay_maxmeasures =5.;	
-    }
+    \notes \context PianoStaff < 
+    	\soprane
+        \bass
+    >
     \midi {
-        \tempo 4 = 84;
+        \tempo 4 = 80;
     }
 }
 
 % EOF
+