Imported Upstream version 2.16.0

[lilypond.git] / input / regression / morgenlied.ly

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 9d67c32ca224051e7597484ce3b10c3039b856db..1a19c523ff2b62f05abc6903130c4f58c3c2b2b7 100644 (file)
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.14.0"
+\version "2.16.0"
 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 { \hspace #-3.0 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)\!
+    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'> |
@@ -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
@@ -180,10 +181,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
            }
        }
        \midi {
-         \context {
-           \Score
-           tempoWholesPerMinute = #(ly:make-moment 70 4)
-         }
+         \tempo 4 = 70
        }
     }
 }