Merge remote-tracking branch 'origin/translation'

[lilypond.git] / input / regression / typography-demo.ly

diff --git a/input/regression/typography-demo.ly b/input/regression/typography-demo.ly
index a28429b9dbe4e0a1626b8dcaaaaf93431f03e182..45a9945dfd7f67e4f613014121f0cab9b9a05932 100644 (file)
--- a/input/regression/typography-demo.ly
+++ b/input/regression/typography-demo.ly
@@ -8,8 +8,7 @@ heavily mutilated Edition Peters Morgenlied by Schubert"
 
 }
 
-\version "2.17.6"
-#(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
+\version "2.19.2"
 #(ly:expect-warning (_ "(De)crescendo with unspecified starting volume in MIDI."))
 
 ignoreMelisma =        \set ignoreMelismata = ##t
@@ -35,7 +34,7 @@ modernAccidentals = {
 melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   \time 6/8
   \autoBeamOff
-  << s2.^\markup {  \larger { \hspace #-3.0 Lieblich, etwas geschwind } }
+  << s2.^\markup {  \larger \line { \hspace #-3.1 Lieblich, etwas geschwind } }
      R2.
   >>
   r4 r8 c4 g8 |
@@ -48,7 +47,7 @@ melody =    \relative c'' \repeat volta 2 \context Voice = "singer" {
   \transpose a' e' \relative c'' { a16[ g fis! g] f![ d]  } |
   g4. r8 gis gis |
   a4 a16.[ b32] c8[( a]) fis8 |
-  g4.~ g8-\fermata
+  g4.~ 8-\fermata
 }
 
 
@@ -128,8 +127,8 @@ pianoLH =  \relative c'' \repeat volta 2\new Voice {
         } <<
           \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