Merge branch 'master' into nested-bookparts

[lilypond.git] / input / mutopia / F.Schubert / morgenlied.ly

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 18cd30924a889a28cfc73192bec2ed5a25b0f146..31720633f4cb1f907f5390168466335c22d27ca5 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.7.39"
+\version "2.11.38"
 manuscriptBreak = { \break }
 
 
@@ -160,7 +160,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
           \lyricsto "singer" \new Lyrics \firstVerse
           \lyricsto "singer" \new Lyrics \secondVerse
           \new PianoStaff << 
-              \set PianoStaff.instrument = \markup {
+              \set PianoStaff.instrumentName = \markup {
                   \bold
                   \bigger\bigger\bigger\bigger \huge "2.  " }
               \new Staff \pianoRH
@@ -180,13 +180,12 @@ pianoLH =  \relative c'' \repeat volta 2 {
                \override SpacingSpanner #'spacing-increment = #1.0
                \override Slur #'height-limit = #1.5
            }
-           \context {
-               \PianoStaff
-               \override VerticalAlignment #'forced-distance = #10
-           }
        }
        \midi {
-           \tempo 4 = 70
+         \context {
+           \Score
+           tempoWholesPerMinute = #(ly:make-moment 70 4)
+         }
        }
     }
 }