Merge branch 'stable'

[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 06957bf900d8f91e34551bf613972000391ab6fd..35824868cc6b99ae83795936199df2c3126c776c 100644 (file)
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,15 +1,13 @@
-\version "2.7.13"
+\version "2.12.0"
 \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
   }