X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine.ly;h=1c213476f1d3a57f5a7c1841f959797c59be223c;hb=b777d963f90da011f1cbdf71e4a1d1281c108df2;hp=dfe509d2099d607db1711c3b6489d2bed0d61d68;hpb=edaa86202a05fe55f974037c6c59556ee94076bc;p=lilypond.git

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index dfe509d209..1c213476f1 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.3.22"
+\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
@@ -43,7 +43,7 @@ textII = \lyricmode {
    \context Lyrics = LB { s1 }
    \context Staff = SC \noise
    
-   \context Staff = SB  \context Voice = middle \m 
+   \context Staff = SB  \context Voice = "middle" \m 
    \context Lyrics = LA \lyricsto "middle" \textI
    \context Lyrics = LB \lyricsto "middle" \textII 
 >>