Merge 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 ff3416f0f8a86c248c95b244c1aaaacca20dff38..5717727557ccf15ce6342919b60f2bec8f3b1eff 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.4.0"
+\version "2.11.61"
 manuscriptBreak = { \break }
 
 
@@ -36,11 +36,11 @@ manuscriptBreak = { \break }
 
 \paper  {
 %#(set-global-staff-size (* 5.8 mm))
-    linewidth = #(* mm 160)
+    line-width = #(* mm 160)
     indent = 8\mm
     interscoreline = 2.\mm
-    betweensystemspace = 15\mm
-    raggedbottom = ##t 
+    between-system-space = 15\mm
+    ragged-bottom = ##t 
     }
 
 modernAccidentals = {
@@ -50,10 +50,10 @@ modernAccidentals = {
 }
 
 
-melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
+melody =    \relative c'' \repeat volta 2 \new Voice = "singer" {
     \time 6/8
     \autoBeamOff
-    s1*0^\markup { \bold \large\bigger\bigger { \hspace #-3.0 Lieblich, etwas geschwind } }
+    s1*0^\markup { \bold \large\larger\larger { \hspace #-3.0 Lieblich, etwas geschwind } }
   R2.
   r4 r8 c4 g8 |
   e4 c8
@@ -160,9 +160,9 @@ 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.  " }
+                  \larger\larger\larger\larger \huge "2.  " }
               \new Staff \pianoRH
               \new Staff \pianoLH
           >> 
@@ -171,7 +171,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
        \layout {
            \context {
                \Lyrics
-               minimumVerticalExtent = #'(-0.5 . 2.5)
+               \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5)
                \override LyricText #'font-size = #-1
            }
            \context {
@@ -180,14 +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
-           }
-           inputencoding = "latin1"
        }
        \midi {
-           \tempo 4 = 70
+         \context {
+           \Score
+           tempoWholesPerMinute = #(ly:make-moment 70 4)
+         }
        }
     }
 }