X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fvocal.itely;h=c159c4cf1882003b9030e721a76ce62c9e68bfb7;hb=80340bdefc128536c79733d8c6f3467d91b01f72;hp=a04a8e6ede18177ca332210d899341beda7e2f80;hpb=4ca01b6da8d60b0d8575be05ae974429c91becd5;p=lilypond.git

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index a04a8e6ede..c159c4cf18 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -91,6 +91,7 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
+
 @node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 
@@ -171,7 +172,7 @@ Punctuation, lyrics with accented characters, characters from
 non-English languages, or special characters (such as the heart
 symbol or slanted quotes), may simply be inserted directly
 into the input file, providing it is saved with UTF-8 encoding.
-For more information, see @ref{Text encoding}.
+For more information, see @ref{Special characters}.
 
 @lilypond[quote,verbatim]
 \relative c'' { d8 c16 a bes8 f e' d c4 }
@@ -218,13 +219,14 @@ Notation Reference:
 @ref{Formatting text},
 @ref{Input modes},
 @ref{Manual syllable durations},
-@ref{Text encoding}.
+@ref{Special characters}.
 
 Internals Reference:
 @rinternals{LyricText}.
 
 Snippets:
-@rlsr{Text}
+@rlsr{Text}.
+
 
 @node Aligning lyrics to a melody
 @unnumberedsubsubsec Aligning lyrics to a melody
@@ -339,7 +341,7 @@ Learning Manual:
 
 Notation Reference:
 @ref{Contexts explained},
-@ref{Automatic syllable durations}.
+@ref{Automatic syllable durations},
 @ref{Stanzas},
 @ref{Manual syllable durations},
 @ref{Dialogue over music},
@@ -348,6 +350,7 @@ Notation Reference:
 Internals Reference:
 @rinternals{Lyrics}.
 
+
 @node Automatic syllable durations
 @unnumberedsubsubsec Automatic syllable durations
 
@@ -513,6 +516,7 @@ Notation Reference:
 @ref{Keeping contexts alive},
 @ref{Placing lyrics vertically}.
 
+
 @node Manual syllable durations
 @unnumberedsubsubsec Manual syllable durations
 
@@ -613,15 +617,14 @@ the tilde symbol (@code{~}) to get a lyric tie.
 
 @lilypond[quote,ragged-right,verbatim]
 {
-  \time 3/4
-  \relative c' { c2 e4 g2 e4 }
-  \addlyrics { gran -- de_a -- mi -- go }
-  \addlyrics { pu -- "ro y ho" -- nes -- to }
-  \addlyrics { pu -- ro~y~ho -- nes -- to }
+  \relative c'' { \autoBeamOff
+    r8 b c fis, fis c' b e, }
+  \addlyrics { Che_in ques -- ta_e_in quel -- l'al -- tr'on -- da }
+  \addlyrics { "Che in" ques -- "ta e in" quel -- l'al -- tr'on -- da }
+  \addlyrics { Che~in ques -- ta~e~in quel -- l'al -- tr'on -- da }
 }
 @end lilypond
 
-
 @seealso
 Internals Reference:
 @rinternals{LyricCombineMusic}.
@@ -827,7 +830,6 @@ Internals Reference:
 @rinternals{Tunable context properties}.
 
 @knownissues
-
 Extender lines under melismata are not created automatically; they
 must be inserted manually with a double underscore.
 
@@ -868,7 +870,6 @@ distance between two syllables) and the @code{minimum-length}
 (threshold below which hyphens are removed) properties of
 @code{LyricHyphen}.
 
-
 @seealso
 Internals Reference:
 @rinternals{LyricExtender},
@@ -962,7 +963,6 @@ contraltoWords = \lyricmode { Con -- tral -- to words }
 }
 @end lilypond
 
-
 @seealso
 Notation Reference:
 @ref{Placing lyrics vertically}.
@@ -1099,9 +1099,10 @@ Learning Manual:
 @rlearning{Vocal ensembles}.
 
 Notation Reference:
-@ref{Aligning contexts},
+@ref{Context layout order},
 @ref{Creating contexts}.
 
+
 @node Placing syllables horizontally
 @unnumberedsubsubsec Placing syllables horizontally
 
@@ -2087,6 +2088,7 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
+
 @node Lead sheets
 @unnumberedsubsubsec Lead sheets
 
@@ -2188,6 +2190,7 @@ Internals Reference:
 @rinternals{Lyrics},
 @rinternals{PianoStaff}.
 
+
 @node Score layouts for choral
 @unnumberedsubsubsec Score layouts for choral
 
@@ -2372,10 +2375,10 @@ For details of other page formatting properties, see
 @ref{Page layout}.
 
 @item
-Dialogue cues and stage directions can be inserted with markup.
-See @ref{Text}.  Extensive stage directions can be inserted with
-a section of stand-alone markup between two @code{\score} blocks.
-See @ref{Separate text}.
+Dialogue cues, stage directions and footnotes can be inserted, see
+@ref{Creating footnotes} and @ref{Text}.  Extensive stage directions
+can also be added with a section of stand-alone markups between two
+@code{\score} blocks, see @ref{Separate text}.
 
 @end itemize
 
@@ -2386,6 +2389,7 @@ Musical Glossary:
 @rglos{transposing instrument}.
 
 Notation Reference:
+@ref{Creating footnotes},
 @ref{Grouping staves},
 @ref{Hiding staves},
 @ref{Instrument transpositions},
@@ -2498,6 +2502,7 @@ Notation Reference:
 Extending LilyPond:
 @rextend{Markup construction in Scheme}.
 
+
 @node Musical cues
 @unnumberedsubsubsec Musical cues