X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fmutopia%2FF.Schubert%2Fmorgenlied.ly;h=b7941a4f55b7b53909160aa73dc9f4a238eeca88;hb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;hp=90442b062b8be793b9ec0f8693a91f6948980675;hpb=868ca15a2445e5e5c1873650433dc886416610fa;p=lilypond.git

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 90442b062b..b7941a4f55 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.5.13"
+\version "2.12.0"
 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)
+	  }
 	}
     }
 }