Merge commit 'ce4b499'

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

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index dfe509d2099d607db1711c3b6489d2bed0d61d68..dd8ec91e2debf4ab6d11e098e18ce6110300e705 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
-\version "2.3.22"
+\version "2.11.38"
 
 \header{
 
@@ -9,18 +9,18 @@ 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."
+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 
 >>