X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FJ.S.Bach%2Fbwv940.ly;h=dd41132afaa5d853596b9f6170f9c1824ab29db6;hb=5c14a087ca6cbd665fd631452b7b1283ba0387c3;hp=a6c22044fb0dc3258d8f855b2137da2adf90c6fe;hpb=d2e7425b88e579fe53989106965fa13eab551c92;p=lilypond.git

diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index a6c22044fb..dd41132afa 100644
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.11.61"
 
 %{
  Header for Petites Preludes.
@@ -12,6 +12,8 @@
 %}
 
 
+
+
 \header{
   title =	 "Praeludium"
   composer =	 "Johann Sebastian Bach (1685-1750)"
@@ -31,7 +33,7 @@
   maintainer = "Jan Nieuwenhuizen"
   maintainerEmail = "janneke@gnu.org"
   lastupdated =	 "2003/Aug/22"
-  mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small
+  mutopiapublicdomain = "\\parbox{\paper-width}{\\thefooter\\quad\\small
     \\\\This music is part of the Mutopia project,
     \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
     and placed in the public domain by " + \maintainer +
@@ -41,11 +43,11 @@
  footer = "Mutopia-2003/08/22-nr"
 }
 
-one =   \notes\relative c{
+one = \relative c{
 	\skip 1 |
 	\stemUp
 	r4 d''2 cis4 |
-	\stemBoth
+	\stemNeutral
 	d16 a' g f  e f cis d 
 	e8.\mordent f16  d8.\prall cis16 |
 	\stemUp\tieUp
@@ -62,14 +64,14 @@ one =   \notes\relative c{
 	\bar "|."
 }
 
-two =   \notes\relative c{
+two = \relative c{
 	r16 d'' c bes  a bes f g 
 	a8.\mordent bes16  g8.\prall f16 |
 	\stemDown
 	f2 e2 |
-	\translator Staff=lower \stemUp
+	\change Staff=lower \stemUp
 	r4 a, bes b |
-	\translator Staff=upper \stemDown\tieDown
+	\change Staff=upper \stemDown\tieDown
 	r16 b' a g  f8. f16 e2 ~ |
 	%5
 	e2 ~ e4 ~ e16 e f! d |
@@ -81,21 +83,21 @@ two =   \notes\relative c{
 	fis1
 }
 
-three = \notes\relative c{
+three = \relative c{
 	\stemUp
 	f2 e |
-	\stemBoth
+	\stemNeutral
 	d16 d' c bes  a bes f g 
 	a8.\mordent bes16 
 	g8.\prall f16 |
 	f2 g4 gis |
 	a2 ~ a16 a g f  e f c d |
 	%5
-	e8.\mordent f16  d8.\prall c16 \stemBoth c4. d8 |
+	e8.\mordent f16  d8.\prall c16 \stemNeutral c4. d8 |
 	\stemDown	\tieDown
 
 	e4 ~ e16 f e d  cis a b cis  d e f d |
-	\property Voice.TextScript \set #'font-style = #'finger
+	\override TextScript  #'font-style = #'finger
 	bes2 a ~ |
 	a a |
 	d, cis' |
@@ -104,19 +106,19 @@ three = \notes\relative c{
 	\bar "|."
 }
 
-four =   \notes\relative c{
+four = \relative c{
 	\stemDown 
 	d2 cis |
 	\skip 1*2 |
 	\skip 4*3
-	\translator Staff=upper \stemUp
-	\property Voice.NoteColumn \override #'horizontal-shift = #1
+	\change Staff=upper \stemUp
+	\override NoteColumn #'horizontal-shift = #1
 	c''4 |
 	%5
 	a gis ~ gis16 gis fis e 
 	\skip 4*1
-	\translator Staff=lower \stemDown
-	\property Voice.NoteColumn \override #'horizontal-shift = #0
+	\change Staff=lower \stemDown
+	\override NoteColumn   #'horizontal-shift = #0
 	\stemUp\tieUp
 	b2 a |
 	g a4. gis16 a |
@@ -124,39 +126,47 @@ four =   \notes\relative c{
 	d4. fis16 g r16 bes8. ~ bes4 |
 	%10
 	\stemDown
-	<< d,1  { \fatText s4^\markup { \hspace #20 }
+	<< d,1  { \textLengthOn s4^\markup { \hspace #20 }
 		 s4^\markup { \hspace #1 }  s4 }
 	     >>
 }
 
-global =  \notes{
+global = {
 	\time 4/4
 	\key f \major
 }
 
 \score{
 	% Allegretto
-	\context PianoStaff <<
-		\context Staff = upper <<
+	\new PianoStaff <<
+		\new Staff = "upper" <<
 			\global
-			\context Voice = i\one
-			\context Voice = ii \two
+			\new Voice = "i"\one
+			\new Voice = "ii" \two
 		>>
-		\context Staff = lower <<
+		\new Staff = "lower" <<
 			\global
 			\clef "bass"
-			\context Voice= iii \three
-			\context Voice = iv \four
+			\new Voice = "iii" \three
+			\new Voice = "iv" \four
 		>>
 	>>
-	\paper{
-		linewidth = 17.0 \cm  
-		\translator {
-		    \ScoreContext
-		    SpacingSpanner \set #'spacing-increment = #2.0
+	\layout{
+		line-width = 17.0 \cm  
+		\context {
+		    \Score
+		    \override SpacingSpanner #'spacing-increment = #2.0
 		}
 	}
-	\midi{ \tempo 4 = 40 }
+	
+  \midi {
+    \context {
+      \Score
+      tempoWholesPerMinute = #(ly:make-moment 40 4)
+      }
+    }
+
+
 }