Merge branch 'master' into lilypond/translation

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

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index a9619d50ba588ae940712cade352f8d2c8eb7d68..1c213476f1d3a57f5a7c1841f959797c59be223c 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.4.0"
+\version "2.14.0"
 
 \header{
 
@@ -8,19 +8,19 @@ lyrics will be discarded.  Lyrics will not be set over rests.  You can
 have melismata either by setting a property melismaBusy, or by setting
 automaticMelismas (which will set melismas during slurs and ties).  If
 you want a different order than first Music, then Lyrics, you must
-precook a chord of staves/lyrics and label those.  Of course, the
-lyrics ignores any other rhythms in the piece."
+precook a chord of staves/@/lyrics and label those.  Of course, the
+lyrics ignore any other rhythms in the piece."
 
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
 
 m = \relative c'' {
     \autoBeamOff
     g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
-    \emptyText
+    \textLengthOff
     d8.^"melisma"      \melisma c16
     \melismaEnd
     b