GDPifying vocal sections.

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 2fff6116d92b13e0cd066f80fd66a1dbf0e1576d..309ec4d0bd2bbb9307f5e44ecb9c2af70d74f45e 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -26,14 +26,12 @@ There are a few different ways to define lyrics; we shall begin
 by examining the simplest method, and gradually increase complexity.
 
 @menu
-* Setting simple songs::        
-* Entering lyrics::             
+* Simple lyrics::               
 * Aligning lyrics to a melody::  
-* Working with lyrics and variables::  
+* Vocals and variables::        
 * Flexibility in placement::    
-* Spacing lyrics::              
+* Spacing vocals::              
 * More about stanzas::          
-* Other vocal issues::          
 @end menu
 
 @commonprop
@@ -58,8 +56,17 @@ To make lyrics avoid barlines as well, use
 @}
 @end example
 
+
+@node Simple lyrics
+@subsection Simple lyrics
+
+@menu
+* Setting simple songs::        
+* Entering lyrics::             
+@end menu
+
 @node Setting simple songs
-@subsection Setting simple songs
+@unnumberedsubsubsec Setting simple songs
 
 @cindex \addlyrics
 
@@ -96,7 +103,7 @@ introduced in @ref{Entering lyrics}.
 
 
 @node Entering lyrics
-@subsection Entering lyrics
+@unnumberedsubsubsec Entering lyrics
 
 @cindex lyrics
 @funindex \lyricmode
@@ -232,7 +239,6 @@ verseOne = \lyricmode @{ Joy to the world the Lord is come @}
 Internals Reference: @internalsref{LyricText}, @internalsref{LyricSpace}.
 
 
-
 @node Aligning lyrics to a melody
 @subsection Aligning lyrics to a melody
 
@@ -510,8 +516,16 @@ Internals Reference: @internalsref{LyricExtender},
 @internalsref{LyricHyphen}
 
 
+@node Vocals and variables
+@subsection Vocals and variables
+
+@menu
+* Working with lyrics and variables::  
+@end menu
+
 @node Working with lyrics and variables
-@subsection Working with lyrics and variables
+@unnumberedsubsubsec Working with lyrics and variables
+
 @cindex lyrics, variables
 
 To define variables containing lyrics, the function @code{\lyricmode}
@@ -797,8 +811,15 @@ lyr = \lyricmode { I like my cat! }
 @end lilypond
 
 
+@node Spacing vocals
+@subsection Spacing vocals
+
+@menu
+* Spacing lyrics::              
+@end menu
+
 @node Spacing lyrics
-@subsection Spacing lyrics
+@unnumberedsubsubsec Spacing lyrics
 
 @cindex Spacing lyrics
 @cindex Lyrics, increasing space between
@@ -844,9 +865,20 @@ layout.
 @node More about stanzas
 @subsection More about stanzas
 
-@cindex stanza number
+@menu
+* Adding stanza numbers ::      
+* Adding dynamics marks::       
+* Adding singer names::         
+* Printing stanzas at the end ::  
+* Printing stanzas at the end in multiple columns ::  
+@end menu
+
+
+@node Adding stanza numbers 
 @unnumberedsubsubsec Adding stanza numbers 
 
+@cindex stanza number
+
 Stanza numbers can be added by setting @code{stanza}, e.g.,
 
 @lilypond[quote,ragged-right,verbatim,relative=2,fragment]
@@ -865,6 +897,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g.,
 These numbers are put just before the start of the first syllable.
 
 
+@node Adding dynamics marks
 @unnumberedsubsubsec Adding dynamics marks
 
 Stanzas differing in loudness may be indicated by putting a
@@ -890,9 +923,11 @@ text = {
 >>
 @end lilypond
 
+@node Adding singer names
+@unnumberedsubsubsec Adding singer names
+
 @cindex singer name
 @cindex name of singer
-@unnumberedsubsubsec Adding singer names
 
 Names of singers can also be added.  They are printed at the start of
 the line, just like instrument names.  They are created by setting
@@ -911,6 +946,7 @@ the line, just like instrument names.  They are created by setting
 @end lilypond
 
 
+@node Printing stanzas at the end 
 @unnumberedsubsubsec Printing stanzas at the end 
 
 Sometimes it is appropriate to have one stanza set
@@ -955,6 +991,7 @@ its fleece was white as snow.
 @end lilypond
 
 
+@node Printing stanzas at the end in multiple columns 
 @unnumberedsubsubsec Printing stanzas at the end in multiple columns 
 
 When a piece of music has many verses, they are often printed in
@@ -1028,12 +1065,11 @@ text = \lyricmode {
 Internals Reference: @internalsref{LyricText}, @internalsref{StanzaNumber},
 @internalsref{VocalName}.
 
-
-
-@node Other vocal issues
-@subsection Other vocal issues
-
+@c TODO: stick elsewhere
 @ignore
+@n ode Other vocal issues
+@s ubsection Other vocal issues
+
 yeah, I'm giving up somewhat by stuffing a bunch of things in
 here.  But at least they're in the manual now; it's easier to
 move them around in the manual once they're already here.
@@ -1041,11 +1077,12 @@ move them around in the manual once they're already here.
 Besides, if users complain about everything stuffed in here, I
 can ask them for specific instructions about where to move these
 examples, and that might get them more involved in the docs.  -gp
-@end ignore
+
 
 @q{Parlato} is spoken without pitch but still with rhythm; it is
 notated by cross noteheads.  This is demonstrated in
 @ref{Special noteheads}.
+@end ignore