Added Cameron Horsburgh's multiple stanzas docs.

diff --git a/ChangeLog b/ChangeLog
index b9e467bcddcf11d3b7d1ef15755f85ddd64e1e2e..d9d6f1e0aaf22cbb1fa2297bb90a36f3c0eb2b56 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-12  Graham Percival  <gpermus@gmail.com>
+
+       * Documentation/user/instrument-notation.itely: added
+       Cameron Horsburgh's multiple stanzas docs.  Thanks!
+
 2005-11-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * lily/GNUmakefile

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 837f077cbbf35fe4c5b38216675168ee691e3d4c..d32a95aa832a1cbd1e6f7fd1714cd1810423d663 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -737,6 +737,48 @@ More stanzas can be added by adding more
 \addlyrics { joue le jeu }
 @end lilypond
 
+Sometimes it is appropriate to have one stanza set
+to the music, and the rest added in verse form at
+the end of the piece.  This can be accomplished by adding
+the extra verses into a @code{\markup} section outside
+of the main score block.  Notice that there are two
+different ways to force linebreaks when using
+@code{\markup}.
+
+@lilypond[raggedright,verbatim,quote]
+melody = \relative c' {
+e d c d | e e e e |
+d d e d | c1 |
+}
+
+text = \lyricmode {
+\set stanza = "1." Ma- ry had a lit- tle lamb,
+it's fleece was white as snow.
+}
+
+\score{ <<
+  \context Voice = one { \melody }
+  \lyricsto "one" \new Lyrics \text
+       >>
+  \layout { }
+}
+\markup { \column{
+  \line{ Verse 2. }
+  \line{ All the children laughed and played }
+  \line{ To see a lamb at school. }
+  }
+}
+\markup{
+  \wordwrap-string #"
+  Verse 3.
+
+  Mary took it home again,
+
+  It was against the rule."
+}
+@end lilypond
+
+
 @c TODO - this isn't such a great place for this note, but I can't
 @c  find a better place without rearranging a lot of lyric stuff.
 @c  It's yet another thing to look at post-3.0.

diff --git a/THANKS b/THANKS
index e4c5b87e320fe17cf360f7a3b4ad39dc2c53b041..da00bde8ca35799da94d4375fb11bc52a94f7940 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -13,6 +13,7 @@ Graham Percival   - Documentation Editor
 CONTRIBUTORS
 
 Bruce Fairchild
+Cameron Horsburgh
 Heikki Junes
 Joe Neeman
 Sven Axelsson