Imported Upstream version 2.18.0

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

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 1a19c523ff2b62f05abc6903130c4f58c3c2b2b7..2a2e93dca3f4d239d8004f3bc030d55ca83895fa 100644 (file)
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.16.0"
+\version "2.17.6"
 manuscriptBreak = { \break }
 
 
@@ -52,7 +52,7 @@ modernAccidentals = {
 melody =    \relative c'' \repeat volta 2 \new Voice = "singer" {
     \time 6/8
     \autoBeamOff
-    << s2.^\markup { \bold \large\larger\larger { \hspace #-3.0 Lieblich, etwas geschwind } }
+    << s2.^\markup { \bold \large\larger\larger \line { \hspace #-3.2 Lieblich, etwas geschwind } }
        R2.
     >>
   r4 r8 c4 g8 |
@@ -107,11 +107,11 @@ secondVerse = \lyricmode {
     }
 
 pianoRH =  \relative c''' \repeat volta 2 {
-    \accidentalStyle "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
+    \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> |
@@ -128,7 +128,7 @@ pianoRH =  \relative c''' \repeat volta 2 {
 }
 
 pianoLH =  \relative c'' \repeat volta 2 {
-    \accidentalStyle "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,7 +155,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
     \score {
        << \time 6/8
           \new Staff <<
-              \context Staff \accidentalStyle "modern"
+              \context Staff \accidentalStyle modern
               \melody >>
           \lyricsto "singer" \new Lyrics \firstVerse
           \lyricsto "singer" \new Lyrics \secondVerse
@@ -171,13 +171,13 @@ 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 {