X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fmorgenlied.ly;h=2a2e93dca3f4d239d8004f3bc030d55ca83895fa;hb=7975e9693bbb16fd4417d7fd5017c0b31f2f2ad1;hp=9d67c32ca224051e7597484ce3b10c3039b856db;hpb=2055f35c47a045a50a01ff4dba8524322cfc3b48;p=lilypond.git

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 9d67c32ca2..2a2e93dca3 100644
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.14.0"
+\version "2.17.6"
 manuscriptBreak = { \break }
 
 
@@ -52,8 +52,9 @@ modernAccidentals = {
 melody =    \relative c'' \repeat volta 2 \new Voice = "singer" {
     \time 6/8
     \autoBeamOff
-    s1*0^\markup { \bold \large\larger\larger { \hspace #-3.0 Lieblich, etwas geschwind } }
-  R2.
+    << s2.^\markup { \bold \large\larger\larger \line { \hspace #-3.2 Lieblich, etwas geschwind } }
+       R2.
+    >>
   r4 r8 c4 g8 |
   e4 c8
     <<
@@ -106,12 +107,12 @@ secondVerse = \lyricmode {
     }
 
 pianoRH =  \relative c''' \repeat volta 2 {
-    #(set-accidental-style 'modern)
+    \accidentalStyle modern
     g16(_\p fis a g fis g f e d c b a ) | 
     <g e>8( <es fis a> <d f b> <c e c'>) r8 r | 
     r8 c'( e,) f r a |
-    \once \override DynamicLineSpanner   #'padding =#3
-    r8 << { s8 s8 }  << { fis(\> g)\!
+    \once \override DynamicLineSpanner.padding =#3
+    r8 << { s8\> s8\! }  << { fis( g)
 			    } \\ { c,4 } >> >> r8 <e c g> <e c g> |
     <d c a>4. r8 \clef bass  <d b f> <d b f> |
     e,16_" "_\markup { \bold\italic cresc. } g c g e g d gis b gis d gis |
@@ -127,7 +128,7 @@ pianoRH =  \relative c''' \repeat volta 2 {
 }
 
 pianoLH =  \relative c'' \repeat volta 2 {
-    #(set-accidental-style 'modern)
+    \accidentalStyle modern
     g16( fis a g fis g f e d c b a) | 
     \clef bass g4.( c,8) r r
     \clef treble r4 <bes' c>8([ <a c>)] r <f c'> |
@@ -140,7 +141,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
     fis r4 <g b>8( |
     <f c'>4.)
 
-    \once \override Slur  #'height-limit = #1.0
+    \once \override Slur.height-limit = #1.0
 
     <g c>4.( | <a c>4.) <g b,> |
     c,4 r8 g4 r8 |
@@ -154,7 +155,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
     \score {
 	<< \time 6/8
 	   \new Staff <<
-	       \context Staff #(set-accidental-style 'modern)
+	       \context Staff \accidentalStyle modern
 	       \melody >>
 	   \lyricsto "singer" \new Lyrics \firstVerse
 	   \lyricsto "singer" \new Lyrics \secondVerse
@@ -170,20 +171,17 @@ pianoLH =  \relative c'' \repeat volta 2 {
 	\layout {
 	    \context {
 		\Lyrics
-		\override LyricText #'font-size = #-1
+		\override LyricText.font-size = #-1
 	    }
 	    \context {
 		\Score
-		\override Beam #'beam-thickness = #0.55
-		\override SpacingSpanner #'spacing-increment = #1.0
-		\override Slur #'height-limit = #1.5
+		\override Beam.beam-thickness = #0.55
+		\override SpacingSpanner.spacing-increment = #1.0
+		\override Slur.height-limit = #1.5
 	    }
 	}
 	\midi {
-	  \context {
-	    \Score
-	    tempoWholesPerMinute = #(ly:make-moment 70 4)
-	  }
+	  \tempo 4 = 70
 	}
     }
 }