Merge commit 'origin' into beamlets2

[lilypond.git] / input / mutopia / J.S.Bach / bwv940.ly

diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index 3bdc0a11850f966b3dc28571fd8f55689613998a..8ba1bb45af8c88ba2783f38094be297679389a30 100644 (file)
--- 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 "2.3.16"
+\version "2.12.0"
 
 %{
  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 +
@@ -45,7 +47,7 @@ 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
@@ -84,14 +86,14 @@ two = \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 |
@@ -124,7 +126,7 @@ four = \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 }
             >>
 }
@@ -136,27 +138,35 @@ global = {
 
 \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  
+       \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)
+      }
+    }
+
+
 }