Merge branch 'master' into translation

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

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 1a01f09a1d6c292e48ac21f8f0c7513f2fb0e83c..a8fcffa8473699f9888a05f8492b921d66803867 100644 (file)
--- 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 }
@@ -204,7 +205,7 @@ options, see @ref{Formatting text}.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {formatting-lyrics-syllables.ly}
 
 
@@ -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}.
@@ -1091,17 +1091,18 @@ elaborating these examples, or by examining the
 @rlearning{Vocal ensembles} templates in the Learning Manual.
 
 @snippets
-@lilypondfile[verbatim,lilyquote,texidoc,doctitle]
-{lyrics-old-spacing-settings.ly}
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
 
 @seealso
 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
 
@@ -1147,7 +1148,7 @@ To make this change for all lyrics in the score, set the property in the
 @end lilypond
 
 @snippets
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {lyrics-alignment.ly}
 
 @c TODO: move to LSR -vv
@@ -1953,7 +1954,7 @@ output in LilyPond.
 
 @lilypond[ragged-right,quote,verbatim]
 melody = \relative c' {
-  c c c c | d d d d
+  c4 c c c | d d d d
 }
 
 text = \lyricmode {
@@ -1972,7 +1973,7 @@ text = \lyricmode {
 \markup {
   \fill-line {
     \hspace #0.1 % moves the column off the left margin;
-        % can be removed if space on the page is tight
+     % can be removed if space on the page is tight
      \column {
       \line { \bold "2."
         \column {
@@ -1980,7 +1981,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
-      \hspace #0.1 % adds vertical spacing between verses
+      \vspace #0.1 % adds vertical spacing between verses
       \line { \bold "3."
         \column {
           "This is verse three."
@@ -1988,17 +1989,15 @@ text = \lyricmode {
         }
       }
     }
-    \hspace #0.1  % adds horizontal spacing between columns;
-        % if they are still too close, add more " " pairs
-        % until the result looks good
-     \column {
+    \hspace #0.1 % adds horizontal spacing between columns;
+    \column {
       \line { \bold "4."
         \column {
           "This is verse four."
           "It has two lines."
         }
       }
-      \hspace #0.1 % adds vertical spacing between verses
+      \vspace #0.1 % adds vertical spacing between verses
       \line { \bold "5."
         \column {
           "This is verse five."
@@ -2007,7 +2006,7 @@ text = \lyricmode {
       }
     }
   \hspace #0.1 % gives some extra space on the right margin;
-      % can be removed if page space is tight
+  % can be removed if page space is tight
   }
 }
 @end lilypond
@@ -2087,6 +2086,7 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
+
 @node Lead sheets
 @unnumberedsubsubsec Lead sheets
 
@@ -2094,7 +2094,7 @@ 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]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {simple-lead-sheet.ly}
 
 @seealso
@@ -2188,6 +2188,7 @@ Internals Reference:
 @rinternals{Lyrics},
 @rinternals{PianoStaff}.
 
+
 @node Score layouts for choral
 @unnumberedsubsubsec Score layouts for choral
 
@@ -2283,7 +2284,7 @@ Internals Reference:
 
 @cindex voices, divided
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {using-arpeggiobracket-to-make-divisi-more-visible.ly}
 
 @seealso
@@ -2372,10 +2373,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 +2387,7 @@ Musical Glossary:
 @rglos{transposing instrument}.
 
 Notation Reference:
+@ref{Creating footnotes},
 @ref{Grouping staves},
 @ref{Hiding staves},
 @ref{Instrument transpositions},
@@ -2498,6 +2500,7 @@ Notation Reference:
 Extending LilyPond:
 @rextend{Markup construction in Scheme}.
 
+
 @node Musical cues
 @unnumberedsubsubsec Musical cues
 
@@ -2598,7 +2601,7 @@ possible to define a music function to reduce the amount of typing
 and to make the piano notes clearer.
 
 @snippets
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {adding-orchestral-cues-to-a-vocal-score.ly}
 
 @seealso
@@ -3019,7 +3022,7 @@ of the following snippets.
 
 @snippets
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {chant-or-psalms-notation.ly}
 
 Canticles and other liturgical texts may be set more freely, and
@@ -3028,7 +3031,7 @@ are shown underneath and aligned with the notes.  If so, the notes
 are spaced in accordance with the syllables rather than the notes'
 durations.
 
-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {ancient-notation-template----modern-transcription-of-gregorian-music.ly}
 
 @seealso
@@ -3213,7 +3216,7 @@ 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]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
 {hymn-template.ly}