*** empty log message ***

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

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 5d794793b85a293ff5a840006736ec87c0918176..5cd90ed3c69cbe6e3bd57a2436c05925b2837d11 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,13 +1,13 @@
 
-\version "2.1.19"
+\version "2.2.0"
 
 \header{
-texidoc= "LyricsVoice can be set to a melody automatically.  Excess lyrics will be
-discarded.  LyricsVoice will not be set over rests.  You can have melismata
+texidoc= "Lyrics can be set to a melody automatically.  Excess 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 LyricsVoice, you must
-precook a chord of staves/lyrics and label those.  Of course
+you want a different order than first Music, then Lyrics, you must
+precook a chord of staves/lyrics and label those.  Of course,
 @code{\rhythm} ignores any other rhythms in the piece.  Hyphens and
 extenders do not assume anything about lyric lengths, so they continue
 to work."
@@ -27,20 +27,20 @@ m = \notes  \relative c'' {
 
 noise = \repeat unfold 6 \notes \relative c'' { g16 g g g }
 
- textI = \context LyricsVoice = "middle-1" \lyrics { la2 __ la -- la __ la la la la la  }
-textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da da da  }
+ textI = \context Lyrics = "middle-1" \lyrics { la2 __ la -- la __ la la la la la  }
+textII = \context Lyrics = "middle-1" \lyrics { da -- da __ da -- da da da da da  }
 
 \score {
     \notes << \context Staff = SA \noise
-      \context LyricsVoice = LA { s1 }
+      \context Lyrics = LA { s1 }
       \context Staff = SB { s1 }
-      \context LyricsVoice = LB { s1 }
+      \context Lyrics = LB { s1 }
       \context Staff = SC \noise
       
       \addlyrics
          \context Staff = SB \context Voice="middle" \m
-         << \context LyricsVoice = LA \textI
-           \context LyricsVoice = LB \textII
+         << \context Lyrics = LA \textI
+           \context Lyrics = LB \textII
          >>
          
     >>