Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index a4cb15f50c454f3f12988394fbe07128bf33afe1..424653ee48d3530eb2aa88b142b1ec8f1494c4ed 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,50 +1,51 @@
 
-\version "1.9.1"
+\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."
+
+}
+
+\layout { ragged-right= ##t }
+
+
+
+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 = \lyricmode {
+    la2 __ la -- la __ la la la la la
 }
 
-    \paper { raggedright= ##t }
-
-
-
-m = \notes  \relative c'' {
-       \property Staff.automaticMelismata = ##t
-       \autoBeamOff
-       g8( a)  r8 \times 2/3 { g'8( f e) } r8 \grace {  d16[ c b] } e4
-       \emptyText
-       d8.^"melisma"   \melisma c16
-       \melismaEnd
-       b }
-
-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 \noise
-      \context Lyrics = LA { s1 }
-      \context Staff = SB { s1 }
-      \context Lyrics = LB { s1 }
-      \context Staff = SC \noise
-      
-      \addlyrics
-         \context Staff = SB \context Voice="middle" \m
-         < \context Lyrics = LA \textI
-           \context Lyrics = LB \textII
-         >
-         
-    >
+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 
+>>
+
+