X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine.ly;h=43d7001a30d34caedd75699d2d686ed84b0f01ce;hb=cec3578c72af76e3e8c8b4603d5d03c8bd32c1e5;hp=874d5aac1afa162c32f478b2972b8f4ccc55718d;hpb=68a168bff1fec7f8011b2afa82d4fc89182c4bf7;p=lilypond.git

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 874d5aac1a..43d7001a30 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,24 +1,15 @@
-\version "1.3.146"
+\version "1.5.68"
+
 \header{
-texidoc="
-Lyrics can be set to a melody automatically.  Excess lyrics will be
-dumped.  Lyrics 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 Lyrics, you must
-precook a chord of staffs/lyrics and label those.  Of course
+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.
-"
-
-
-filename = 	 "twinkle-pop.ly"
-xtitle = 	 "Ah, vous dirais-je, maman "
-description = 	 "twinkle twinkle in pop-song-settings"
-composer = 	 "traditional"
-enteredby = 	 "HWN, chords by Johan Vromans"
-copyright = 	 "public domain"
+to work."
 }
 
 
@@ -26,26 +17,26 @@ copyright = 	 "public domain"
 m = \notes  \relative c'' {
 	\property Staff.automaticMelismata = ##t
 	\autoBeamOff
-	g4  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
+	g8 () a  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
 	\emptyText
 	d8.^"melisma" 	\melisma c16
 	\melismaEnd
 	b }
 
-noisebeat = \notes \relative c'' {g16 g g g }
-noise =   { \noisebeat \noisebeat \noisebeat  \noisebeat \noisebeat \noisebeat }
-textI =   \lyrics  { la2 __ la -- la __ la la la la la  }
-textII =   \lyrics  { da -- da __ da -- da da da da da  }
+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  }
 
 \score {
-    \notes < \context Staff = SA \m
+    \notes < \context Staff = SA \noise
       \context Lyrics = LA { s1 }
       \context Staff = SB { s1 }
       \context Lyrics = LB { s1 }
       \context Staff = SC \noise
       
       \addlyrics
-	  \context Staff = SB \m
+	  \context Staff = SB \context Voice="middle" \m
 	  < \context Lyrics = LA \textI
 	    \context Lyrics = LB \textII
 	  >