release: 1.3.118

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

diff --git a/input/test/lyric-combine.ly b/input/test/lyric-combine.ly
index 3c63f9f257488f8c5a4acea8de39084236e0b9bf..1d67184f26e86e1f908a986f7173466f490aec7e 100644 (file)
--- a/input/test/lyric-combine.ly
+++ b/input/test/lyric-combine.ly
@@ -1,15 +1,28 @@
 \header{
-filename =      "twinkle-pop.ly";
-%title =        "Ah, vous dirais-je, maman ";
-description =   "twinkle twinkle in pop-song-settings";
-composer =      "traditional";
-enteredby =     "HWN, chords by Johan Vromans";
-copyright =     "public domain";
+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
+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
+@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";
 }
 
-\version "1.3.5";
+\version "1.3.117";
 
-m =\notes  \relative c'' {
+m = \notes  \relative c'' {
        \property Staff.automaticMelismata = ##t
        \autoBeamOff
        g4  r8 \times 2/3 { g'8( f )e } r8 \grace { [d16 c b] } e4
@@ -18,10 +31,10 @@ m =\notes  \relative c'' {
        \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  }
+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  }
 
 \score {
     \notes < \context Staff = SA \m