Clarified \addlyrics vs \lyricmode.

diff --git a/ChangeLog b/ChangeLog
index fe19d8de5537ca2cec2c85210697e34cc93579ae..fbb8b7e5d9be6a35f00c5fc136c0cfae7bc1a309 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,8 +5,8 @@
        * Documentation/user/lilypond.tely, lilypond-book.itely,
        tutorial.itely: change references to 2.5.x to 2.6.x.
 
-       * Documentation/user/instrument-notation.itely: clarified lyric
-       section names.
+       * Documentation/user/instrument-notation.itely: clarified \addlyrics
+       vs \lyricmode.
 
 2005-05-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index c4f940d19bfe833c1fabd9039ac4ccf56876c186..79fdebfcd3189e80d4cd1a13820efc8a0feecea8 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -662,8 +662,8 @@ for complex vocal music.
 
 
 @menu
-* Setting simple songs with @code{\addlyrics}::  
-* Entering lyrics with @code{\lyricmode}::  
+* Setting simple songs::        
+* Entering lyrics::             
 * Hyphens and extenders::       
 * The Lyrics context::          
 * Flexibility in alignment::    
@@ -672,8 +672,8 @@ for complex vocal music.
 * Other vocal issues::          
 @end menu
 
-@node Setting simple songs with @code{\addlyrics}
-@subsection Setting simple songs with @code{\addlyrics}
+@node Setting simple songs
+@subsection Setting simple songs
 
 The easiest way to add lyrics to a melody is to append
 @cindex \addlyrics
@@ -729,17 +729,16 @@ is the same as
 @code{\addlyrics} cannot handle polyphony.
 
 
-@node Entering lyrics with @code{\lyricmode}
-@subsection Entering lyrics with @code{\lyricmode}
-
+@node Entering lyrics
+@subsection Entering lyrics
 
 @cindex lyrics
 @cindex @code{\lyricmode}
 @cindex punctuation
 
 Lyrics are entered in a special input mode.  This mode is introduced
-by the keyword @code{\lyricmode}, or by using @code{addlyrics} or
-@code{lyricsto}.  In this mode you can enter lyrics,
+by the keyword @code{\lyricmode}, or by using @code{\addlyrics} or
+@code{\lyricsto}.  In this mode you can enter lyrics,
 with punctuation and accents, and the input @code{d} is not parsed as
 a pitch, but rather as a one letter syllable.  Syllables are entered
 like notes, but with pitches replaced by text.  For example,
@@ -747,6 +746,10 @@ like notes, but with pitches replaced by text.  For example,
 \lyricmode @{ Twin-4 kle4 twin- kle litt- le star2 @}
 @end example
 
+There is a difference between @code{\addlyrics} and
+@code{\lyricmode}.  @code{\addlyrics} and @code {\lyricsto}
+ignore all durations and aligns syllables to notes; @code{\lyricmode}
+uses the durations specified.
 
 A word lyrics mode begins with an alphabetic character, and ends with
 any space or digit.  The following characters can be any character