release commit

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

diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index e075cd7785fef2ecdf239af9d37434813640615c..655d83d871b6e257bae407ab02e29c8ae3a1f630 100644 (file)
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,30 +1,35 @@
+\version "2.8.0"
 \header {
 
-    texidoc = "With the newaddlyrics mechanism, individual lyric lines
-    can be associated with one melody line. For each lyric line, can
-    be tuned whether to follow melismata or not."
-    
+  texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
+    lines can be associated with one melody line. For each lyric line,
+    can be tuned whether to follow melismata or not."
+  
 }
 
-\score {
+
 <<
-    \notes \context Voice = "bla" \relative c'' {
-       c2( d4) e4 ( c2 d4) e4 
-    }
-    \newaddlyrics "bla" \lyrics \new LyricsVoice { bla ab blob blob }
-    \newaddlyrics "bla"
-    \lyrics \new LyricsVoice {
-       bla 
+  \new Voice = "bla" \relative c'' {
+    \autoBeamOff
+    c2( d4) e8[ c b c] f4
+  }
+  \lyricsto "bla"  \new Lyrics  { bla ab blob blob }
+  \lyricsto "bla"  \new Lyrics  {
+    bla 
 
-       \property LyricsVoice . ignoreMelismata = ##t
-       
-       blob
+    \set ignoreMelismata = ##t
+    
+    blob
 
-       %% note: effect of ignoreMelismata delayed one time step.
-       \property LyricsVoice . ignoreMelismata \unset
-       blob
-       
-       blob
-    }
-    >>
-    }
+    %% note: effect of ignoreMelismata delayed one time step.
+    \unset ignoreMelismata 
+    blob
+    
+    blob
+  }
+  
+  \lyricsto "bla"  \new Lyrics  {
+    nes ted lyrics voice with more words than no tes
+  }
+>>
+