Merge commit 'origin/dev/jneeman' into systems-per-page

[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 5eb7bce4eac02e8ad7eb7f5d85df9425a793d314..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.5.13"
+\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 +
@@ -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
                >>
        >>
        \layout{
-               linewidth = 17.0 \cm  
+               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)
+      }
+    }
+
+
 }