X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Flyric-combine.ly;h=424653ee48d3530eb2aa88b142b1ec8f1494c4ed;hb=9d417231ba0363d6b624cccb72d713748ad18271;hp=e5fc8ea3408c7153a36a3d12a8b20db2f117f60c;hpb=aaaff9b890e41906622e14d571ad8fd555cab64e;p=lilypond.git

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index e5fc8ea340..424653ee48 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,49 +1,51 @@
 
-\version "2.3.10"
+\version "2.12.0"
 
 \header{
-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
+
+    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 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."
+precook a chord of staves/lyrics and label those.  Of course, the
+lyrics ignore any other rhythms in the piece."
+
 }
 
-    \paper { 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
-	d8.^"melisma" 	\melisma c16
-	\melismaEnd
-	b }
+m = \relative c'' {
+    \autoBeamOff
+    g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
+    \textLengthOff
+    d8.^"melisma" 	\melisma c16
+    \melismaEnd
+    b
+}
 
 noise = \repeat unfold 6  \relative c'' { g16 g g g }
 
- 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 {
-     << \context Staff = SA \noise
-      \context Lyrics = LA { s1 }
-      \context Staff = SB { s1 }
-      \context Lyrics = LB { s1 }
-      \context Staff = SC \noise
-      
-      \oldaddlyrics
-	  \context Staff = SB \context Voice="middle" \m
-	  << \context Lyrics = LA \textI
-	    \context Lyrics = LB \textII
-	  >>
-	  
-    >>
+textI = \lyricmode {
+    la2 __ la -- la __ la la la la la
 }
 
+textII = \lyricmode {
+    da -- da __ da -- da da da da da
+}
+
+
+<< \context Staff = SA \noise
+   \context Lyrics = LA { s1 }
+   \context Staff = SB { s1 }
+   \context Lyrics = LB { s1 }
+   \context Staff = SC \noise
+   
+   \context Staff = SB  \context Voice = "middle" \m 
+   \context Lyrics = LA \lyricsto "middle" \textI
+   \context Lyrics = LB \lyricsto "middle" \textII 
+>>
+