Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / input / regression / lyric-combine-new.ly

diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index 4a227634911e1b9706b645a1112ca8d3c71adfdd..b01227ac9a9ff1c0909ed640d70f64c76ab2731d 100644 (file)
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,20 +1,18 @@
-\version "2.6.0"
+\version "2.19.2"
 \header {
-
   texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
-    lines can be associated with one melody line. For each lyric line,
-    can be tuned whether to follow melismata or not."
-  
+    lines can be associated with one melody line. Each lyric line
+can be tuned to either follow or ignore melismata."
 }
 
 
 <<
-  \context Voice = "bla" \relative c'' {
+  \new Voice = "bla" \relative c'' {
     \autoBeamOff
     c2( d4) e8[ c b c] f4
   }
-  \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
-  \lyricsto "bla"  \new Lyrics  {
+  \new Lyrics  \lyricsto "bla"  { bla ab blob blob }
+  \new Lyrics  \lyricsto "bla"  {
     bla 
 
     \set ignoreMelismata = ##t
@@ -28,7 +26,7 @@
     blob
   }
   
-  \lyricsto "bla"  \new Lyrics  {
+  \new Lyrics  \lyricsto "bla"  {
     nes ted lyrics voice with more words than no tes
   }
 >>