Release: bump Welcome versions.

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

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 4b5cd97dd412ea82e778eb32d37f2f02616e8429..550489f92d14df514943f2f561e46a1fc0735fbe 100644 (file)
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.13.36"
+\version "2.19.12"
 manuscriptBreak = { \break }
 
 
@@ -38,8 +38,7 @@ manuscriptBreak = { \break }
 %#(set-global-staff-size (* 5.8 mm))
     line-width = #(* mm 160)
     indent = 8\mm
-    interscoreline = 2.\mm
-    between-system-space = 15\mm
+    system-system-spacing.basic-distance = #10.3
     ragged-bottom = ##t 
     }
 
@@ -53,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
     <<
@@ -64,7 +64,7 @@ melody =    \relative c'' \repeat volta 2 \new Voice = "singer" {
   d4 f8 a16[ g fis g] f[ d] |
   g4. r8 gis gis |
   a4 a16.[ b32] c4 fis,8 |
-  g4.~ g8-\fermata g8 g |
+  g4.~ 8-\fermata g8 g |
   as4 as8 g4 g8 |
   fis4 fis8 r8 g g  |
   a!4 a8 g4 g8 |
@@ -107,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 |
@@ -128,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'> |
@@ -141,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 |
@@ -155,10 +155,10 @@ 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
+          \new Lyrics \lyricsto "singer" \firstVerse
+          \new Lyrics \lyricsto "singer" \secondVerse
           \new PianoStaff << 
               \set PianoStaff.instrumentName = \markup {
                   \bold
@@ -171,21 +171,17 @@ pianoLH =  \relative c'' \repeat volta 2 {
        \layout {
            \context {
                \Lyrics
-               \override VerticalAxisGroup #'minimum-Y-extent = #'(-0.5 . 2.5)
-               \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
        }
     }
 }