Docs: NR 2.1 Vocal music: rework section headings

 - move material around to make a clearer distinction
   between common and special notation (nothing has been
   deleted)

 - add new section headings to cover specific types of
   vocal music

 - much material remains to be added at places indicated
   by TBC (to be completed), and TODOs.

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 9cf034d27c7f85bb793c08d05da9ebfaf5487e87..34a5fea0a247345aba16f54796a7d3a7baf6deec 100644 (file)
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -21,36 +21,37 @@ that the lyrics will be aligned with the notes of their melody.
 * Common notation for vocal music::
 * Entering lyrics::
 * Aligning lyrics to a melody::
-* Specific uses of lyrics::
+* Techniques specific to lyrics::
 * Stanzas::
+* Songs::
+* Choral::
+* Opera and stage musicals::
+* Chants hymns and psalms::
+* Ancient vocal music::
+
 @end menu
 
 
 @node Common notation for vocal music
 @subsection Common notation for vocal music
 
-This section discusses issues related to vocal music in general, and
-to some particular styles of vocal music.
+This section and sections 2.1.2 to 2.1.5 discuss issues common to
+all types of vocal music.  Issues specific to certain types of
+vocal music are covered in section 2.1.6 on.
 
 @menu
-* References for vocal music and lyrics::
-* Opera::
-* Song books::
-* Spoken music::
-* Chants::
-* Ancient vocal music::
+* Common references for vocal music::
 @end menu
 
 
-@node References for vocal music and lyrics
-@unnumberedsubsubsec References for vocal music and lyrics
+@node Common references for vocal music
+@unnumberedsubsubsec Common references for vocal music
 
-@c TODO: split this section in two parts? -vv
-
-Various issues may arise when engraving vocal music.  Some of these
-are discussed in this section, while others are explained elsewhere:
+This section indicates where to find details of notation issues
+that may arise in any type of vocal music.
 
 @itemize
+
 @item
 Most styles of vocal music use written text as lyrics.  An introduction
 to this notation is to be found in @rlearning{Setting simple songs}.
@@ -60,89 +61,21 @@ Vocal music is likely to require the use of @code{markup} mode, either
 for lyrics of for other text elements (character's names, etc.).
 This syntax is described in @ref{Text markup introduction}.
 
-@item
-Lead sheets may be printed by combining vocal parts and @q{chord mode};
-this syntax is explained in @ref{Chord notation}.
-
 @item
 @q{Ambitus} may be added at the beginning of vocal staves, as explained
 in @ref{Ambitus}.
 
-@item
-Vocal parts may be printed using traditional clefs, as shown in @ref{Clef}.
-
-@item
-Ancient vocal music is supported, as explained in @ref{Ancient notation}.
 @end itemize
 
 
-@node Opera
-@unnumberedsubsubsec Opera
-
-@c TODO
-TBC
-
-@c add characters names snippet -vv
-
-@node Song books
-@unnumberedsubsubsec Song books
-
-@c TODO
-TBC
-
-@snippets
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{simple-lead-sheet.ly}
-
-
-@seealso
-Notation Reference:
-@ref{Chord notation}.
-
-
-@node Spoken music
-@unnumberedsubsubsec Spoken music
-@cindex parlato
-@cindex Sprechgesang
-Such effects as @q{parlato} or @q{Sprechgesang} require performers to speak
-without pitch but still with rhythm; these are notated by cross
-note heads, as demonstrated in @ref{Special note heads}.
-
-@c TODO add "marking-notes-on-spoken-parts" snippet -vv
-@c add "showing the rhythm of a melody" snip
-@c add "one staff-line notation"
-@c add "improvisation" ref
-@c add "lyrics independents of notes" ref
-
-@node Chants
-@unnumberedsubsubsec Chants
-
-@c TODO Add text from lsr and -user
-TBC
-
-@node Ancient vocal music
-@unnumberedsubsubsec Ancient vocal music
-
-@c TODO
-TBC
-
-@c Add "Printing both the ancient and the modern clef in vocal music" snippet,
-@c and "Transcription of Ancient music with incipit" snippet. -vv
-
-
-@seealso
-Notation Reference:
-@ref{Ancient notation}.
-
-
 @node Entering lyrics
 @subsection Entering lyrics
 
-@c TODO add one sentence here. -vv
+Lyrics are entered in lyric mode.  This section explains how this
+done.
 
 @menu
 * Lyrics explained::
-* Setting simple songs::
 * Working with lyrics and variables::
 @end menu
 
@@ -301,45 +234,6 @@ Internals Reference:
 @rinternals{LyricSpace}.
 
 
-@c TODO: this title has to be changed (possible confusion with LM) -vv
-@node Setting simple songs
-@unnumberedsubsubsec Setting simple songs
-
-@cindex \addlyrics
-
-The easiest way to add lyrics to a melody is to append
-
-@example
-\addlyrics @{ @var{the lyrics} @}
-@end example
-
-@noindent
-to a melody.  Here is an example,
-
-@lilypond[ragged-right,verbatim,fragment,quote]
-\time 3/4
-\relative c' { c2 e4 g2. }
-\addlyrics { play the game }
-@end lilypond
-
-More stanzas can be added by adding more
-@code{\addlyrics} sections
-
-@lilypond[ragged-right,verbatim,fragment,quote]
-\time 3/4
-\relative c' { c2 e4 g2. }
-\addlyrics { play the game }
-\addlyrics { speel het spel }
-\addlyrics { joue le jeu }
-@end lilypond
-
-The command @code{\addlyrics} cannot handle polyphony settings.  For these
-cases you should use @code{\lyricsto} and @code{\lyricmode}, as will be
-introduced in @ref{Lyrics explained}.
-
-@c TODO: one additional section may be needed here,
-@c such as "advanced lyric syntax" or whatever -vv
-
 @node Working with lyrics and variables
 @unnumberedsubsubsec Working with lyrics and variables
 
@@ -532,6 +426,8 @@ The following example uses different commands for entering lyrics.
 The second stanza is not properly aligned because the durations
 were not specified.  A solution for that would be to use @code{\lyricsto}.
 
+@cindex \addlyrics
+
 The @code{\addlyrics} command is actually just a convenient way
 to write a more complicated LilyPond structure that sets up the
 lyrics.
@@ -549,6 +445,29 @@ is the same as
 \new Lyrics \lyricsto "blah" @{ LYRICS @}
 @end example
 
+Here is an example,
+
+@lilypond[ragged-right,verbatim,fragment,quote]
+\time 3/4
+\relative c' { c2 e4 g2. }
+\addlyrics { play the game }
+@end lilypond
+
+More stanzas can be added by adding more
+@code{\addlyrics} sections
+
+@lilypond[ragged-right,verbatim,fragment,quote]
+\time 3/4
+\relative c' { c2 e4 g2. }
+\addlyrics { play the game }
+\addlyrics { speel het spel }
+\addlyrics { joue le jeu }
+@end lilypond
+
+The command @code{\addlyrics} cannot handle polyphony settings.
+For these cases you should use @code{\lyricsto} and
+@code{\lyricmode}, for details see@ref{Lyrics explained}.
+
 @node Manual syllable durations
 @unnumberedsubsubsec Manual syllable durations
 
@@ -801,8 +720,8 @@ Internals Reference:
 TBC
 
 
-@node Specific uses of lyrics
-@subsection Specific uses of lyrics
+@node Techniques specific to lyrics
+@subsection Techniques specific to lyrics
 
 @c TODO This whole section is to be reorganized. -vv
 
@@ -814,7 +733,7 @@ differing ways.  Such variations can still be captured with
 * Divisi lyrics::
 * Lyrics independent of notes::
 * Spacing out syllables::
-* Centering lyrics between staves::
+* Placement of lyrics between staves::
 @end menu
 
 
@@ -992,10 +911,11 @@ To make lyrics avoid bar lines as well, use
 @end ignore
 
 
-@node Centering lyrics between staves
-@unnumberedsubsubsec Centering lyrics between staves
+@node Placement of lyrics between staves
+@unnumberedsubsubsec Placement of lyrics between staves
 
 @c TODO Add text from -user
+@c TODO Add new spacing properties, centering lyrics, etc
 TBC
 
 @node Stanzas
@@ -1403,5 +1323,149 @@ Internals Reference:
 @rinternals{StanzaNumber}.
 
 
+@node Songs
+@subsection Songs
+
+@menu
+* References for songs::
+* Lead sheets::
+@end menu
+
+@node References for songs
+@unnumberedsubsubsec References for songs
+
+@c TODO chords, setting simple songs (LM), stanzas
+TBC
+
+@node Lead sheets
+@unnumberedsubsubsec Lead sheets
+
+Lead sheets may be printed by combining vocal parts and @q{chord mode};
+this syntax is explained in @ref{Chord notation}.
+
+@snippets
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{simple-lead-sheet.ly}
+
+@seealso
+Notation Reference:
+@ref{Chord notation}.
+
+
+@node Choral
+@subsection Choral
+
+@menu
+* References for choral::
+* Score layouts::
+@end menu
+
+@node References for choral
+@unnumberedsubsubsec References for choral
+
+@c TODO templates, divisi lyrics, shape noteheads (etc)
+
+TBC
+
+@node Score layouts
+@unnumberedsubsubsec Score layouts
+
+@c TODO 2-stave and 4-stave, accompaniment, SATB, different lyrics
+
+TBC
+
+@node Opera and stage musicals
+@subsection Opera and stage musicals
+
+@menu
+* References for opera and stage musicals::
+* Spoken music::
+* Dialogue over music::
+@end menu
+
+@node References for opera and stage musicals
+@unnumberedsubsubsec References for opera and stage musicals
+
+@c TODO Choral, cues, character names, French staves
+@c vocal/conductor scores
+@c add characters names snippet -vv
+
+TBC
+
+@node Spoken music
+@unnumberedsubsubsec Spoken music
+
+@cindex parlato
+@cindex Sprechgesang
+Such effects as @q{parlato} or @q{Sprechgesang} require performers to speak
+without pitch but still with rhythm; these are notated by cross
+note heads, as demonstrated in @ref{Special note heads}.
+
+@c TODO add "marking-notes-on-spoken-parts" snippet -vv
+@c add "showing the rhythm of a melody" snip
+@c add "one staff-line notation"
+@c add "improvisation" ref
+@c add "lyrics independents of notes" ref
+
+@node Dialogue over music
+@unnumberedsubsubsec Dialogue over music
+
+TBC
+
+
+@node Chants hymns and psalms
+@subsection Chants hymns and psalms
+
+@menu
+* References for chants hymns and psalms::
+* Partial measures::
+* Multiple syllables to a note::
+* Pointing::
+@end menu
+
+@node References for chants hymns and psalms
+@unnumberedsubsubsec References for chants hymns and psalms
+
+@c TODO Add text from lsr and -user
+TBC
+
+@node Partial measures
+@unnumberedsubsubsec Partial measures
+
+Hymn tunes frequently start and end every line of music with
+partial measures so that each line of music corresponds exactly
+with a line of text.  This requires a @code{\partial} command at
+the start of the music and @code{\bar "|"} or @code{\bar "||"}
+commands at the end of each line.
+
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{hymn-template.ly}
+
+
+@node Multiple syllables to a note
+@unnumberedsubsubsec Multiple syllables to a note
+
+TBC
+
+@node Pointing
+@unnumberedsubsubsec Pointing
+
+TBC
+
+@node Ancient vocal music
+@subsection Ancient vocal music
+
+Ancient vocal music is supported, as explained in @ref{Ancient notation}.
+
+@c TODO
+
+@c Add "Printing both the ancient and the modern clef in vocal music" snippet,
+@c and "Transcription of Ancient music with incipit" snippet. -vv
+
+@seealso
+Notation Reference:
+@ref{Ancient notation}.
+
+