X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fvocal.itely;h=7549cfeed510c35fd53c2b2e59a8ccc21636bd09;hb=de924bddd22886a0a67decbde45acd5da441bf6d;hp=05d76e698d1da5a8bf7dbc6c3f0984244875a03b;hpb=235de94b7408e9badc7b82c8e0dae8f05009adc3;p=lilypond.git

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 05d76e698d..7549cfeed5 100644
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -57,17 +57,23 @@ 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}.
+Most styles of vocal music use written text as lyrics.  An
+introduction to this notation is to be found in
+@rlearning{Setting simple songs}.
 
 @item
-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}.
+Vocal music is likely to require the use of @code{markup} mode,
+either for lyrics or for other text elements (characters' names,
+etc.)  This syntax is described in @ref{Text markup introduction}.
 
 @item
-@notation{Ambitus} may be added at the beginning of vocal staves, as explained
-in @ref{Ambitus}.
+@notation{Ambitus} may be added at the beginning of vocal staves,
+as explained in @ref{Ambitus}.
+
+@item
+Dynamic markings by default are placed below the staff, but in
+choral music they are usually placed above the staff in order to
+avoid the lyrics, as explained in @ref{Score layouts for choral}.
 
 @end itemize
 
@@ -75,6 +81,14 @@ in @ref{Ambitus}.
 Music Glossary:
 @rglos{ambitus}.
 
+Learning Manual:
+@rlearning{Setting simple songs}.
+
+Notation Reference:
+@ref{Text markup introduction},
+@ref{Ambitus},
+@ref{Score layouts for choral}.
+
 Snippets:
 @rlsr{Vocal music}.
 
@@ -416,12 +430,14 @@ 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 }
+@lilypond[ragged-right,verbatim,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 polyphonic settings.
@@ -574,12 +590,14 @@ tie is implemented with the Unicode character U+203F, so be
 sure to have a font (like DejaVuLGC) installed that includes this
 glyph.
 
-@lilypond[quote,ragged-right,fragment,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 }
+@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 }
+}
 @end lilypond
 
 
@@ -629,7 +647,7 @@ together:
     e8
   }
   \new Lyrics \lyricsto "melody" {
-    Ki -- ri -- e __
+    Ky -- ri -- e __
   }
 >>
 @end lilypond
@@ -647,7 +665,7 @@ entering lyrics:
     e8 ( d e2 )
   }
   \new Lyrics \lyricsto "melody" {
-    Ki -- ri -- e __
+    Ky -- ri -- e __
   }
 >>
 @end lilypond
@@ -666,7 +684,7 @@ providing automatic beaming is switched off.  See
     e2.
   }
   \new Lyrics \lyricsto "melody" {
-    Ki -- ri -- e
+    Ky -- ri -- e
   }
 >>
 @end lilypond
@@ -689,7 +707,7 @@ are bracketed between @code{\melisma} and @code{\melismaEnd}.
     e2.
   }
   \new Lyrics \lyricsto "melody" {
-    Ki -- ri -- e
+    Ky -- ri -- e
   }
 >>
 @end lilypond
@@ -710,7 +728,7 @@ to be added to the melisma.
     e8 d e2
   }
   \new Lyrics \lyricsto "melody" {
-    Ki -- ri -- _ _ _ e __ _ _
+    Ky -- ri -- _ _ _ e __ _ _
   }
 >>
 @end lilypond
@@ -1054,10 +1072,10 @@ Notation Reference:
 @cindex Spacing lyrics
 @cindex Lyrics, increasing space between
 
-To increase the spacing between lyrics, set the @code{minimum-distance}
-property of @code{LyricSpace}.
+To increase the spacing between lyrics, set the
+@code{minimum-distance} property of @code{LyricSpace}.
 
-@lilypond[relative,verbatim,fragment,quote,ragged-right]
+@lilypond[relative=1,verbatim,quote,ragged-right]
 {
   c c c c
   \override Lyrics.LyricSpace #'minimum-distance = #1.0
@@ -1589,7 +1607,7 @@ attaching lyrics to those specific contexts:
 
 Stanza numbers can be added by setting @code{stanza}, e.g.,
 
-@lilypond[quote,ragged-right,verbatim,relative=2,fragment]
+@lilypond[quote,ragged-right,verbatim,relative=2]
 \new Voice {
   \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
@@ -1671,9 +1689,10 @@ text = {
 
 Names of singers can also be added.  They are printed at the start of
 the line, just like instrument names.  They are created by setting
-@code{vocalName}.  A short version may be entered as @code{shortVocalName}.
+@code{vocalName}.  A short version may be entered as
+@code{shortVocalName}.
 
-@lilypond[fragment,ragged-right,quote,verbatim,relative=2]
+@lilypond[ragged-right,quote,verbatim,relative=2]
 \new Voice {
   \time 3/4 g2 e4 a2 f4 g2.
 } \addlyrics {
@@ -1729,28 +1748,34 @@ are to be ignored.
 
 @subsubheading Adding syllables to grace notes
 
+@cindex grace notes and lyrics
+@cindex lyrics on grace notes
+
 By default, grace notes (e.g. via @code{\grace}) do not get assigned
 syllables when using @code{\lyricsto}, but this behavior can be
 changed:
 
 @lilypond[verbatim,ragged-right,quote]
-\relative c' {
-  f4 \appoggiatura a32 b4
-  \grace { f16[ a16] } b2
-  \afterGrace b2 { f16[ a16] }
-  \appoggiatura a32 b4
-  \acciaccatura a8 b4
-}
-\addlyrics {
-  normal
-  \set includeGraceNotes = ##t
-  case,
-  gra -- ce case,
-  after -- grace case,
-  \set ignoreMelismata = ##t
-  app. case,
-  acc. case.
-}
+<<
+  \new Voice = melody \relative c' {
+    f4 \appoggiatura a32 b4
+    \grace { f16[ a16] } b2
+    \afterGrace b2 { f16[ a16] }
+    \appoggiatura a32 b4
+    \acciaccatura a8 b4
+  }
+  \new Lyrics
+  \lyricsto melody {
+    normal
+    \set includeGraceNotes = ##t
+    case,
+    gra -- ce case,
+    after -- grace case,
+    \set ignoreMelismata = ##t
+    app. case,
+    acc. case.
+  }
+>>
 @end lilypond
 
 @knownissues
@@ -1819,10 +1844,11 @@ within the lyrics by setting the @code{associatedVoice} property:
 @end lilypond
 
 @noindent
-The text for the first stanza is set to the melody called @q{lahlah}
-in the usual way, but the second stanza is set initally to the
-@code{lahlah} context and is then switched to the @code{alternative}
-melody for the syllables @q{ran} to @q{sau} by the lines:
+The text for the first stanza is set to the melody called
+@q{lahlah} in the usual way, but the second stanza is set initally
+to the @code{lahlah} context and is then switched to the
+@code{alternative} melody for the syllables @q{ran} to @q{sau} by
+the lines:
 
 @example
 \set associatedVoice = "alternative" % applies to "ran"
@@ -2039,8 +2065,8 @@ Snippets:
 @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}.
+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]
@@ -2102,7 +2128,7 @@ For information about @code{ChoirStaff} and @code{PianoStaff} see
 @ref{Grouping staves}.
 
 @item
-Shape noteheads, as used in Sacred Harp and similar notation, are
+Shape note heads, as used in Sacred Harp and similar notation, are
 described in @ref{Shape note heads}.
 
 @item
@@ -2169,7 +2195,7 @@ the two systems.  See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
-@ref{Page formatting}.
+@ref{Page layout}.
 
 @end itemize
 
@@ -2215,7 +2241,7 @@ Notation Reference:
 @ref{Changing spacing},
 @ref{Displaying spacing},
 @ref{Fitting music onto fewer pages},
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Score layout},
 @ref{Separating systems},
 @ref{Setting the staff size},
@@ -2318,7 +2344,7 @@ See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
-@ref{Page formatting}.
+@ref{Page layout}.
 
 @item
 Dialogue cues and stage directions can be inserted with markup.
@@ -2339,7 +2365,7 @@ Notation Reference:
 @ref{Hiding staves},
 @ref{Instrument transpositions},
 @ref{Nested staff groups},
-@ref{Page formatting},
+@ref{Page layout},
 @ref{Separating systems},
 @ref{Transpose},
 @ref{Writing parts},
@@ -2782,7 +2808,7 @@ Bar lines can also be removed on a staff-by-staff basis:
 
 To remove bar lines from just a section of music treat it as a
 cadenza.  If the section is long you may need to insert dummy
-barlines with @code{\bar ""} to show where the line should break.
+bar lines with @code{\bar ""} to show where the line should break.
 
 @lilypond[verbatim,quote,relative=2]
 a4 b c2 |
@@ -3169,7 +3195,8 @@ commands at the end of each line.
 @node Ancient vocal music
 @subsection Ancient vocal music
 
-Ancient vocal music is supported, as explained in @ref{Ancient notation}.
+Ancient vocal music is supported, as explained in
+@ref{Ancient notation}.
 
 @c TODO