Merge remote-tracking branch 'origin/translation'

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

diff --git a/input/regression/morgenlied.ly b/input/regression/morgenlied.ly
index 9b5003e3f0619859ea4fe6eee1c22ac0451952a8..c33568319802e06e098d82263a2f88cf0c8a6e68 100644 (file)
--- a/input/regression/morgenlied.ly
+++ b/input/regression/morgenlied.ly
@@ -27,7 +27,7 @@ been lowered
 
 }
 
-\version "2.17.6"
+\version "2.19.2"
 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 |
@@ -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 |
@@ -157,8 +157,8 @@ pianoLH =  \relative c'' \repeat volta 2 {
           \new Staff <<
               \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