Rearrange Vocal music, thanks Valentin!

diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely
index 8802245e2993adccf3b984b9c2667a5ec3d0bce6..87672da51842711d1c75b24cac9d48942b290940 100644 (file)
--- a/Documentation/user/instrument-notation.itely
+++ b/Documentation/user/instrument-notation.itely
@@ -677,9 +677,8 @@ by examining the simplest method, and gradually increase complexity.
 * Setting simple songs::        
 * Entering lyrics::             
 * Hyphens and extenders::       
-* The Lyrics context::          
-* Melismata::                   
-* Another way of entering lyrics::  
+* Aligning lyrics to a melody::  
+* Working with lyrics and identifiers::  
 * Flexibility in placement::    
 * Spacing lyrics::              
 * More about stanzas::          
@@ -772,7 +771,9 @@ There are two main methods to specify the horizontal placement
 of the syllables, either by specifying the duration of each syllable
 explicitly, like in the example above, or by automatically aligning
 the lyrics to a melody or other voice of music, using @code{\addlyrics}
-or @code{\lyricsto}.  For more details see @ref{The Lyrics context}.
+or @code{\lyricsto}.
+@c  TODO: broken
+@c For more details see @ref{The Lyrics context}.
 
 A word or syllable of lyrics begins with an alphabetic character, and ends
 with
@@ -912,8 +913,13 @@ Program reference: @internalsref{LyricHyphen}, @internalsref{LyricExtender}.
 
 
 
-@node The Lyrics context
-@subsection The Lyrics context
+@node Aligning lyrics to a melody
+@subsection Aligning lyrics to a melody
+
+@funindex \lyricmode
+@funindex \addlyrics
+@funindex \lyricsto
+
 
 Lyrics are printed by interpreting them in the context called
 @internalsref{Lyrics}.
@@ -922,8 +928,32 @@ Lyrics are printed by interpreting them in the context called
 \new Lyrics \lyricmode @dots{}
 @end example
 
+There are two main methods to specify the horizontal placement
+of the syllables:
+
+@itemize @bullet
+@item
+by automatically aligning
+the lyrics to a melody or other voice of music, using @code{\addlyrics}
+or @code{\lyricsto}.
+
+@item
+or by specifying the duration of each syllable
+explicitly, using @code{\lyricmode}
+@end itemize
+
+@menu
+* Automatic syllable durations::  
+* Another way of entering lyrics::  
+* Assigning more than one syllable to a single note::  
+* More than one note on a single syllable::  
+* Extenders and hyphens::       
+@end menu
+
+@node Automatic syllable durations
+@subsubsection Automatic syllable durations
+
 @cindex automatic syllable durations
-@funindex \lyricsto
 @cindex lyrics and melodies
 
 This will place the lyrics according to the durations that were
@@ -978,6 +1008,9 @@ is the same as
 \new Lyrics \lyricsto "blah" @{ LYRICS @}
 @end example
 
+@node Another way of entering lyrics
+@subsubsection Another way of entering lyrics
+
 For different or more complex orderings, the best way is to setup the
 hierarchy of staves and lyrics first, e.g.,
 @example
@@ -1012,9 +1045,24 @@ The final input would resemble
 Program reference: @internalsref{LyricCombineMusic},
 @internalsref{Lyrics}.
 
+@node Assigning more than one syllable to a single note
+@subsubsection Assigning more than one syllable to a single note
+
+
+@funindex _
+@cindex ties, in lyrics
+
+
 
-@node Melismata
-@subsection Melismata
+@c Here come the section which used to be "Melismata"
+@c the new title might be more self-explanatory
+
+
+@node More than one note on a single syllable
+@subsubsection More than one note on a single syllable
+
+@cindex melisma
+@cindex melismata
 
 The @code{\lyricsto} command detects melismata: it only puts one
 syllable under a tied or slurred group of notes.  If you want to force
@@ -1066,9 +1114,16 @@ Program reference: @internalsref{Melisma_translator}.
 Melismata are not detected automatically, and extender lines must be
 inserted by hand.
 
+@node Extenders and hyphens
+@subsubsection Extenders and hyphens
 
-@node Another way of entering lyrics
-@subsection Another way of entering lyrics
+@cindex melisma
+@cindex extender
+
+
+@node Working with lyrics and identifiers
+@subsection Working with lyrics and identifiers
+@cindex lyrics, identifiers
 
 Lyrics can also be entered without @code{\lyricsto}.  In this case the
 duration of each syllable must be entered explicitly, for example,