version that you are working on. See TRANSLATION for details.
@end ignore
-@c \version "2.11.61"
+@c \version "2.11.57"
@node Vocal music
@section Vocal music
-@c TODO: inspirational headword
+@c TODO: CLARIFY
+@c TODO: delete this comment block
+@c http://code.google.com/p/lilypond/issues/detail?id=248
+@c Done, see @node Lyrics independent of notes ----FV
-This section explains how to typeset vocal music, and make sure
-that the lyrics will be aligned with the notes of their melody.
+@c http://code.google.com/p/lilypond/issues/detail?id=329
+@c Done, see @node Working with lyrics and variables ----FV
+
+@c partially done, needs improvement, see Switching to an alternative melody ----FV
+@ignore
+
+> I think the issue here is that changing the associatedVoice
+> happens one step
+> later than expected. I could be wrong, but I don't think this
+> is obviously
+> documented.
+
+If you read section "Switching the melody associated with a lyrics
+line"
+it indeed says "Again, the command must be one syllable too
+early,..."!
+One problem with the current formulation is that the "Again"
+refers to what's described 2 subsections earlier in "Lyrics to
+multiple notes of a melisma", which isn't obvious unless you have
+read all the sections
+sequentially.
+
+
+@c Done in @node Extenders and hyphens ---FV
+@c also done (duplicated) in @node Multiple notes to one syllable --FV
+I don't know who's working on the vocal music right now, but I
+found something that should be clarified in NR 2.1.2.4.
+
+It should be made clear that __ is used to crate a lyric extender,
+and _ is used to add a note to a melisma, so both __ and _ are
+used. The example shows it, but there is no description of the
+lyrics extender in this section.
+@end ignore
+
+
+Since LilyPond input files are text, there are two issues to consider
+when working with vocal music:
+
+@itemize
+@item
+Song texts must be interpreted as text, not notes. For example, the
+input@tie{}@code{d} should be interpreted as a one letter syllable,
+not the note@tie{}D.
+
+@item
+Song texts must be aligned with the notes of their melody.
+@end itemize
+
+To address the first issue, the fundamental method is the special mode
+opened by @code{\lyricmode} that interprets its contents as text.
+This mode is implicit by some abbreviated methods, as we will see.
+
+Aligning of text with melodies can be made automatically, but if you
+specify the durations of the syllables it can also be made manually.
+Lyrics aligning and typesetting are prepared with the help of skips,
+hyphens and extender lines.
+
+All these methods and their combinations lead to a few different ways
+to define lyrics; we shall begin by examining the simplest method, and
+gradually increase complexity.
@menu
-* Entering lyrics::
+* Common notation for vocals::
* Aligning lyrics to a melody::
-* Specific uses of lyrics::
+* Placement of lyrics::
* Stanzas::
@end menu
-@node Entering lyrics
-@subsection Entering lyrics
-@c TODO add one sentence here. -vv
+@node Common notation for vocals
+@subsection Common notation for vocals
@menu
-* Lyrics explained::
+* References for vocal music::
* Setting simple songs::
+* Entering lyrics::
* Working with lyrics and variables::
-* References for vocal music::
@end menu
+@node References for vocal music
+@subsubsection References for vocal music
+
+TBC
+@c TODO Add @refs
+
+@q{Parlato} is spoken without pitch but still with rhythm; it is
+notated by cross note heads. This is demonstrated in
+@ref{Special note heads}.
-@node Lyrics explained
-@unnumberedsubsubsec Lyrics explained
+
+@node Setting simple songs
+@subsubsection 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{Entering lyrics}.
+
+
+
+@node Entering lyrics
+@subsubsection Entering lyrics
@cindex lyrics
@funindex \lyricmode
@cindex spaces, in lyrics
@cindex quotes, in lyrics
-@c FIXME: this section is to be rewritten.
-Since LilyPond input files are text, there is at least one
-issue to consider when working with vocal music:
-song texts must be interpreted as text, not notes. For example, the
-input@tie{}@code{d} should be interpreted as a one letter syllable,
-not the note@tie{}D.
-Therefore, a special lyric mode has to be used, either explicitely
-or using some abbreviated methods.
-
Lyrics are entered in a special input mode, which can be introduced
by the keyword @code{\lyricmode}, or by using @code{\addlyrics} or
@code{\lyricsto}. In this mode you can enter lyrics,
\addlyrics { pu- ro~y~ho- nes- to }
@end lilypond
-@noindent
-The lyric tie is implemented with the Unicode character
-@code{U+203F}; therefore a font that includes this glyph
-(such as DejaVuLGC) has to be used. More explanations about
-text and non-text fonts can be found in @ref{Fonts}.
+The lyric tie is implemented with the Unicode character U+203F, so be
+sure to have a font (Like DejaVuLGC) installed that includes this
+glyph.
To enter lyrics with characters from non-English languages, or with
@seealso
-Notation Reference:
-@ref{Fonts}.
-
Internals Reference:
@rinternals{LyricText},
@rinternals{LyricSpace}.
-
-@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
+@subsubsection Working with lyrics and variables
@cindex lyrics, variables
@end example
@ignore
-@c FIXME
+
http://code.google.com/p/lilypond/issues/detail?id=329
The problem cannot be reproduced.
The following has no sense, because the issue seems to be fixed.
@rinternals{Lyrics}.
-@node References for vocal music
-@unnumberedsubsubsec References for vocal music
-
-TBC
-@c TODO Add @refs
-
-@c Nope -- this section is to be removed.
-@c With a vengeance :-) -vv
-
-@q{Parlato} is spoken without pitch but still with rhythm; it is
-notated by cross note heads. This is demonstrated in
-@ref{Special note heads}.
-
-
@node Aligning lyrics to a melody
@subsection Aligning lyrics to a melody
@funindex \addlyrics
@funindex \lyricsto
-@c FIXME: this stuff is to be rewritten. -vv
-
-Aligning of text with melodies can be made automatically, but if you
-specify the durations of the syllables it can also be made manually.
-Lyrics aligning and typesetting are prepared with the help of skips,
-hyphens and extender lines.
Lyrics are printed by interpreting them in the context called
@rinternals{Lyrics}.
@end menu
@node Automatic syllable durations
-@unnumberedsubsubsec Automatic syllable durations
+@subsubsection Automatic syllable durations
@cindex automatic syllable durations
@cindex lyrics and melodies
@end example
@node Manual syllable durations
-@unnumberedsubsubsec Manual syllable durations
+@subsubsection Manual syllable durations
Lyrics can also be entered without @code{\addlyrics} or
@code{\lyricsto}. In this case,
@node Multiple syllables to one note
-@unnumberedsubsubsec Multiple syllables to one note
+@subsubsection Multiple syllables to one note
@funindex _
@node Multiple notes to one syllable
-@unnumberedsubsubsec Multiple notes to one syllable
+@subsubsection Multiple notes to one syllable
@cindex melisma
@cindex melismata
You can define melismata entirely in the lyrics, by entering @code{_}
for every extra note that has to be added to the the melisma.
-@c FIXME: clarify: __ is used to crate a lyric extender,
-@c _ is used to add a note to a melisma, so both __ and _ are needed.
-
@c verbose! --FV
@c duplicated: TODO fix
Additionaly, you can make an extender line to be typeset to indicate
beamed, and automatic beaming (see @ref{Setting automatic beam
behavior}) is switched off.
-@c FIXME: this now links to LM -vv
+@c TODO: there might be some more relevant place for
+@c the following link (?)
@cindex SATB
@cindex choral score
inserted by hand.
@node Skipping notes
-@unnumberedsubsubsec Skipping notes
+@subsubsection Skipping notes
Making a lyric line run slower than the melody can be achieved by
inserting @code{\skip}s into the lyrics. For every @code{\skip},
-the text will be delayed another note. The @code{\skip} command
-must be followed by a valid duration, but this is ignored when
-@code{\skip} is used in lyrics.
+the text will be delayed another note.
For example,
@node Extenders and hyphens
-@unnumberedsubsubsec Extenders and hyphens
+@subsubsection Extenders and hyphens
@cindex melisma
@cindex extender
@rinternals{LyricHyphen}
@node Lyrics and repeats
-@unnumberedsubsubsec Lyrics and repeats
+@subsubsection Lyrics and repeats
@c TODO New section. Add text
TBC
-@node Specific uses of lyrics
-@subsection Specific uses of lyrics
-
-@c FIXME This whole section is to be reorganized. -vv
+@node Placement of lyrics
+@subsection Placement of lyrics
Often, different stanzas of one song are put to one melody in slightly
differing ways. Such variations can still be captured with
@node Divisi lyrics
-@unnumberedsubsubsec Divisi lyrics
+@subsubsection Divisi lyrics
You can display alternate (or divisi) lyrics by naming voice
contexts and attaching lyrics to those specific contexts.
@node Lyrics independent of notes
-@unnumberedsubsubsec Lyrics independent of notes
+@subsubsection Lyrics independent of notes
@cindex Devnull context
@node Chants
-@unnumberedsubsubsec Chants
+@subsubsection Chants
@c TODO Add text from lsr and -user
TBC
@node Spacing out syllables
-@unnumberedsubsubsec Spacing out syllables
+@subsubsection Spacing out syllables
@cindex Spacing lyrics
@cindex Lyrics, increasing space between
}
@end lilypond
-@c @snippets
-@c This snippet has been renamed to "lyrics-alignment.ly"
-@c update as soon as lsr/is updated -vv
-@c @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-@c {lyrics-alignment.ly}
+@snippets
+@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+{aligning-lyrics.ly}
+
-@c TODO: move to LSR -vv
@snippets
Checking to make sure that text scripts and lyrics are within the margins is
@node Centering lyrics between staves
-@unnumberedsubsubsec Centering lyrics between staves
+@subsubsection Centering lyrics between staves
@c TODO Add text from -user
TBC
@node Adding stanza numbers
-@unnumberedsubsubsec Adding stanza numbers
+@subsubsection Adding stanza numbers
@cindex stanza number
@end ignore
@node Adding dynamics marks to stanzas
-@unnumberedsubsubsec Adding dynamics marks to stanzas
+@subsubsection Adding dynamics marks to stanzas
Stanzas differing in loudness may be indicated by putting a
dynamics mark before each stanza. In LilyPond, everything coming in
@end lilypond
@node Adding singers' names to stanzas
-@unnumberedsubsubsec Adding singers' names to stanzas
+@subsubsection Adding singers' names to stanzas
@cindex singer name
@cindex name of singer
@end lilypond
@node Stanzas with different rhythms
-@unnumberedsubsubsec Stanzas with different rhythms
+@subsubsection Stanzas with different rhythms
@subsubheading Ignoring melismata
Here, @code{alternative} is the name of the @code{Voice} context
containing the triplet.
-@c FIXME: make this easier to understand -vv
This command must be one syllable too early, before @q{Ty} in this
case. In other words, changing the associatedVoice happens one step
later than expected. This is for technical reasons, and it is not a
@node Printing stanzas at the end
-@unnumberedsubsubsec Printing stanzas at the end
+@subsubsection Printing stanzas at the end
Sometimes it is appropriate to have one stanza set
to the music, and the rest added in verse form at
@node Printing stanzas at the end in multiple columns
-@unnumberedsubsubsec Printing stanzas at the end in multiple columns
+@subsubsection Printing stanzas at the end in multiple columns
When a piece of music has many verses, they are often printed in
multiple columns across the page. An outdented verse number often