Use @quoteNUM_DIR for @q and @qq. REQUIRES TEXINFO 4.11.

[lilypond.git] / Documentation / user / vocal.itely

diff --git a/Documentation/user/vocal.itely b/Documentation/user/vocal.itely
index 63886b700b8e389c80f8e1a14fe8b2db9cb57c79..e7a339e562fafcd4f5c422bf3790cf104efc49bd 100644 (file)
--- a/Documentation/user/vocal.itely
+++ b/Documentation/user/vocal.itely
@@ -1,4 +1,10 @@
 @c -*- coding: utf-8; mode: texinfo; -*-
+@ignore
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+@end ignore
 
 @node Vocal music
 @section Vocal music
@@ -20,24 +26,7 @@ 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::             
-* Aligning lyrics to a melody::  
-* 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::       
-* Working with lyrics and identifiers::  
-* Flexibility in placement::    
-* Lyrics to multiple notes of a melisma::  
-* Divisi lyrics::               
-* Switching the melody associated with a lyrics line::  
-* Lyrics independent of notes::  
-* Spacing lyrics::              
-* More about stanzas::          
-* Ambitus::                     
-* Other vocal issues::          
+* TODO subsection vocal music::  
 @end menu
 
 
@@ -65,9 +54,29 @@ To make lyrics avoid barlines as well, use
 
 
 @node TODO subsection vocal music
-@section TODO subsection vocal music
+@subsection TODO subsection vocal music
+
+@menu
+* Setting simple songs::        
+* Entering lyrics::             
+* Aligning lyrics to a melody::  
+* 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::       
+* Working with lyrics and variables::  
+* Flexibility in placement::    
+* Lyrics to multiple notes of a melisma::  
+* Divisi lyrics::               
+* Switching the melody associated with a lyrics line::  
+* Lyrics independent of notes::  
+* Spacing lyrics::              
+* More about stanzas::          
+* Other vocal issues::          
+@end menu
 
-@anchor{Setting simple songs}
+@node Setting simple songs
 @unnumberedsubsubsec Setting simple songs
 
 @cindex \addlyrics
@@ -104,7 +113,7 @@ introduced in @ref{Entering lyrics}.
 
 
 
-@anchor{Entering lyrics}
+@node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 
 @cindex lyrics
@@ -218,7 +227,7 @@ any 8-bit character with ASCII code over 127, or a two-character
 combination of a backslash followed by one of @code{`}, @code{'},
 @code{"}, or @code{^}.
 
-To define identifiers containing lyrics, the function @code{lyricmode}
+To define variables containing lyrics, the function @code{lyricmode}
 must be used.
 
 @example
@@ -242,7 +251,7 @@ Program reference: @internalsref{LyricText}, @internalsref{LyricSpace}.
 
 
 
-@anchor{Aligning lyrics to a melody}
+@node Aligning lyrics to a melody
 @unnumberedsubsubsec Aligning lyrics to a melody
 
 @funindex \lyricmode
@@ -279,7 +288,7 @@ explicitly, using @code{\lyricmode}
 * Extenders and hyphens::       
 @end menu
 
-@anchor{Automatic syllable durations}
+@node Automatic syllable durations
 @unnumberedsubsubsec Automatic syllable durations
 
 @cindex automatic syllable durations
@@ -335,13 +344,13 @@ is the same as
 \new Lyrics \lyricsto "blah" @{ LYRICS @}
 @end example
 
-@anchor{Another way of entering lyrics}
+@node Another way of entering lyrics
 @unnumberedsubsubsec Another way of entering lyrics
 
 Lyrics can also be entered without @code{\addlyrics} or
 @code{\lyricsto}.  In this case,
 syllables are entered like notes -- but with pitches replaced by text -- and the
-duration of each syllable must be entered explicitly. For example:
+duration of each syllable must be entered explicitly.  For example:
  
 @example
 play2 the4 game2.
@@ -378,7 +387,7 @@ Here is an example demonstrating manual lyric durations,
 Program reference: @internalsref{Lyrics}.
 
 
-@anchor{Assigning more than one syllable to a single note}
+@node Assigning more than one syllable to a single note
 @unnumberedsubsubsec Assigning more than one syllable to a single note
 
 
@@ -409,7 +418,7 @@ Program reference: @internalsref{LyricCombineMusic}.
 @c the new title might be more self-explanatory
 
 
-@anchor{More than one note on a single syllable}
+@node More than one note on a single syllable
 @unnumberedsubsubsec More than one note on a single syllable
 
 @cindex melisma
@@ -470,7 +479,7 @@ behavior}) is switched off.
 @cindex choral score
 
 A complete example of a SATB score setup is in section
-@ref{Vocal ensembles}.
+@rlearning{Vocal ensembles}.
 
 
 @refcommands
@@ -490,7 +499,7 @@ Program reference: @internalsref{Melisma_translator}.
 Melismata are not detected automatically, and extender lines must be
 inserted by hand.
 
-@anchor{Extenders and hyphens}
+@node Extenders and hyphens
 @unnumberedsubsubsec Extenders and hyphens
 
 @cindex melisma
@@ -519,14 +528,14 @@ Program reference: @internalsref{LyricExtender},
 @internalsref{LyricHyphen}
 
 
-@anchor{Working with lyrics and identifiers}
-@unnumberedsubsubsec Working with lyrics and identifiers
-@cindex lyrics, identifiers
+@node Working with lyrics and variables
+@unnumberedsubsubsec Working with lyrics and variables
+@cindex lyrics, variables
 
-To define identifiers containing lyrics, the function @code{\lyricmode}
-must be used. You do not have to enter durations though, if you add
+To define variables containing lyrics, the function @code{\lyricmode}
+must be used.  You do not have to enter durations though, if you add
 @code{\addlyrics} or @code{\lyricsto}
-when invoking your identifier.
+when invoking your variable.
  
 @example
 verseOne = \lyricmode @{ Joy to the world the Lord is come @}
@@ -579,7 +588,7 @@ Program reference: @internalsref{LyricCombineMusic},
 @internalsref{Lyrics}.  
 
 
-@anchor{Flexibility in placement}
+@node Flexibility in placement
 @unnumberedsubsubsec Flexibility in placement
 
 Often, different stanzas of one song are put to one melody in slightly
@@ -594,7 +603,7 @@ differing ways.  Such variations can still be captured with
 @end menu
 
 
-@anchor{Lyrics to multiple notes of a melisma}
+@node Lyrics to multiple notes of a melisma
 @unnumberedsubsubsec Lyrics to multiple notes of a melisma
 
 One possibility is that the text has a melisma in one stanza, but
@@ -648,7 +657,7 @@ For example,
 @end lilypond
 
 
-@anchor{Divisi lyrics}
+@node Divisi lyrics
 @unnumberedsubsubsec Divisi lyrics
 
 You can display alternate (or divisi) lyrics by naming voice
@@ -694,7 +703,7 @@ section.
 
 
 
-@anchor{Switching the melody associated with a lyrics line}
+@node Switching the melody associated with a lyrics line
 @unnumberedsubsubsec Switching the melody associated with a lyrics line
 
 More complex variations in text underlay are possible.  It is possible
@@ -777,7 +786,7 @@ The underlay is switched back to the starting situation by assigning
 @code{lahlah} to @code{associatedVoice}.
 
 
-@anchor{Lyrics independent of notes}
+@node Lyrics independent of notes
 @unnumberedsubsubsec Lyrics independent of notes
 
 In some complex vocal music, it may be desirable to place
@@ -806,7 +815,7 @@ lyr = \lyricmode { I like my cat! }
 @end lilypond
 
 
-@anchor{Spacing lyrics}
+@node Spacing lyrics
 @unnumberedsubsubsec Spacing lyrics
 
 @cindex Spacing lyrics
@@ -850,7 +859,7 @@ layout.
 @end lilypond
 
 
-@anchor{More about stanzas}
+@node More about stanzas
 @unnumberedsubsubsec More about stanzas
 
 @cindex stanza number
@@ -967,8 +976,8 @@ its fleece was white as snow.
 @unnumberedsubsubsec 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
-introduces each verse. The following example shows how to produce such
+multiple columns across the page.  An outdented verse number often
+introduces each verse.  The following example shows how to produce such
 output in Lilypond.
 
 @lilypond[ragged-right,quote,verbatim]
@@ -1039,7 +1048,7 @@ Program reference: @internalsref{LyricText}, @internalsref{StanzaNumber},
 
 
 
-@anchor{Other vocal issues}
+@node Other vocal issues
 @unnumberedsubsubsec Other vocal issues
 
 @ignore