Issue 3450: \addlyrics doesn't work with TabStaff

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

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 1a01f09a1d6c292e48ac21f8f0c7513f2fb0e83c..81155c956cccbac63412d92e3518e323e9879a4a 100644 (file)
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -7,7 +7,7 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.14.0"
+@c \version "2.17.19"

 
 @node Vocal music
 @section Vocal music
 
 @node Vocal music
 @section Vocal music


@@ -91,6 +91,7 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
 Snippets:
 @rlsr{Vocal music}.
 

+

 @node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 
 @node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 


@@ -148,30 +149,11 @@ compile.  Instead, braces should always be surrounded with white space:
 \lyricmode @{ lah lah lah @}
 @end example
 
 \lyricmode @{ lah lah lah @}
 @end example
 

-@cindex overrides in lyric mode
-@funindex \override in \lyricmode
-
-Similarly, in lyric mode, a period will be included in the
-alphabetic sequence that it follows.  As a consequence, spaces
-must be inserted around the period in @code{\override} commands.
-Do @emph{not} write
-
-@example
-\override Score.LyricText #'font-shape = #'italic
-@end example
-
-@noindent
-but instead use
-
-@example
-\override Score . LyricText #'font-shape = #'italic
-@end example
-

 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.
 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 }
 
 @lilypond[quote,verbatim]
 \relative c'' { d8 c16 a bes8 f e' d c4 }


@@ -204,7 +186,7 @@ options, see @ref{Formatting text}.
 
 @snippets
 
 
 @snippets
 

-@lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]

 {formatting-lyrics-syllables.ly}
 
 
 {formatting-lyrics-syllables.ly}
 
 


@@ -218,13 +200,14 @@ Notation Reference:
 @ref{Formatting text},
 @ref{Input modes},
 @ref{Manual syllable durations},
 @ref{Formatting text},
 @ref{Input modes},
 @ref{Manual syllable durations},

-@ref{Text encoding}.
+@ref{Special characters}.

 
 Internals Reference:
 @rinternals{LyricText}.
 
 Snippets:
 
 Internals Reference:
 @rinternals{LyricText}.
 
 Snippets:

-@rlsr{Text}
+@rlsr{Text}.
+

 
 @node Aligning lyrics to a melody
 @unnumberedsubsubsec Aligning lyrics to a melody
 
 @node Aligning lyrics to a melody
 @unnumberedsubsubsec Aligning lyrics to a melody


@@ -339,7 +322,7 @@ Learning Manual:
 
 Notation Reference:
 @ref{Contexts explained},
 
 Notation Reference:
 @ref{Contexts explained},

-@ref{Automatic syllable durations}.
+@ref{Automatic syllable durations},

 @ref{Stanzas},
 @ref{Manual syllable durations},
 @ref{Dialogue over music},
 @ref{Stanzas},
 @ref{Manual syllable durations},
 @ref{Dialogue over music},


@@ -348,6 +331,7 @@ Notation Reference:
 Internals Reference:
 @rinternals{Lyrics}.
 
 Internals Reference:
 @rinternals{Lyrics}.
 

+

 @node Automatic syllable durations
 @unnumberedsubsubsec Automatic syllable durations
 
 @node Automatic syllable durations
 @unnumberedsubsubsec Automatic syllable durations
 


@@ -399,7 +383,7 @@ the named Voice context containing the melody with
 @lilypond[quote,verbatim,relative=2]
 <<
   \new Voice = "melody" {
 @lilypond[quote,verbatim,relative=2]
 <<
   \new Voice = "melody" {

-    a4 a a a
+    a1 a4. a8 a2

   }
   \new Lyrics \lyricsto "melody" {
     These are the words
   }
   \new Lyrics \lyricsto "melody" {
     These are the words


@@ -464,6 +448,7 @@ More stanzas can be added by adding more
 @end lilypond
 
 The command @code{\addlyrics} cannot handle polyphonic settings.
 @end lilypond
 
 The command @code{\addlyrics} cannot handle polyphonic settings.

+Also, it cannot be used to associate lyrics to a @code{TabVoice}.

 For these cases one should use @code{\lyricsto}.
 
 @subheading Using associatedVoice
 For these cases one should use @code{\lyricsto}.
 
 @subheading Using associatedVoice


@@ -513,6 +498,7 @@ Notation Reference:
 @ref{Keeping contexts alive},
 @ref{Placing lyrics vertically}.
 
 @ref{Keeping contexts alive},
 @ref{Placing lyrics vertically}.
 

+

 @node Manual syllable durations
 @unnumberedsubsubsec Manual syllable durations
 
 @node Manual syllable durations
 @unnumberedsubsubsec Manual syllable durations
 


@@ -611,17 +597,21 @@ spaces between the syllables, you can surround the phrase with
 quotes or use a @code{_} character.  Alternatively, you can use
 the tilde symbol (@code{~}) to get a lyric tie.
 
 quotes or use a @code{_} character.  Alternatively, you can use
 the tilde symbol (@code{~}) to get a lyric tie.
 

-@lilypond[quote,ragged-right,verbatim]
+@lilypond[quote,ragged-right,verbatim,relative=2]

 {
 {

-  \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 }
+  { \autoBeamOff
+    r8 b c fis, fis c' b e,
+  }
+  \addlyrics
+  {
+    \override LyricHyphen.minimum-distance = #1.0 % Ensure hyphens are visible
+    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
 
 }
 @end lilypond
 

-

 @seealso
 Internals Reference:
 @rinternals{LyricCombineMusic}.
 @seealso
 Internals Reference:
 @rinternals{LyricCombineMusic}.


@@ -636,9 +626,9 @@ Internals Reference:
 @funindex \melisma
 @funindex \melismaEnd
 
 @funindex \melisma
 @funindex \melismaEnd
 

-Sometimes, particularly in Medieval music, several notes are to be
-sung on one syllable; such vocalises are called melismata, or
-@rglos{melisma}s.  The syllable to a melisma is usually
+Sometimes, particularly in Medieval and baroque music, several notes are
+sung on one syllable; this is called melisma, see
+@rglos{melisma}.  The syllable to a melisma is usually

 left-aligned with the first note of the melisma.
 
 When a melisma occurs on a syllable other that the last one in a
 left-aligned with the first note of the melisma.
 
 When a melisma occurs on a syllable other that the last one in a


@@ -691,6 +681,8 @@ entering lyrics:
 >>
 @end lilypond
 
 >>
 @end lilypond
 

+Note that phrasing slurs do not affect the creation of melismata.
+

 @item
 Notes are considered a melisma if they are manually beamed,
 providing automatic beaming is switched off.  See
 @item
 Notes are considered a melisma if they are manually beamed,
 providing automatic beaming is switched off.  See


@@ -733,9 +725,6 @@ are bracketed between @code{\melisma} and @code{\melismaEnd}.
 >>
 @end lilypond
 
 >>
 @end lilypond
 

-Note that this method cannot be used to indicate two melismata if
-the first one is immediately followed by another.
-

 @item
 A melisma can be defined entirely in the lyrics by entering a
 single underscore character, @code{_}, for every extra note that has
 @item
 A melisma can be defined entirely in the lyrics by entering a
 single underscore character, @code{_}, for every extra note that has


@@ -827,7 +816,6 @@ Internals Reference:
 @rinternals{Tunable context properties}.
 
 @knownissues
 @rinternals{Tunable context properties}.
 
 @knownissues

-

 Extender lines under melismata are not created automatically; they
 must be inserted manually with a double underscore.
 
 Extender lines under melismata are not created automatically; they
 must be inserted manually with a double underscore.
 


@@ -868,7 +856,6 @@ distance between two syllables) and the @code{minimum-length}
 (threshold below which hyphens are removed) properties of
 @code{LyricHyphen}.
 
 (threshold below which hyphens are removed) properties of
 @code{LyricHyphen}.
 

-

 @seealso
 Internals Reference:
 @rinternals{LyricExtender},
 @seealso
 Internals Reference:
 @rinternals{LyricExtender},


@@ -962,7 +949,6 @@ contraltoWords = \lyricmode { Con -- tral -- to words }
 }
 @end lilypond
 
 }
 @end lilypond
 

-

 @seealso
 Notation Reference:
 @ref{Placing lyrics vertically}.
 @seealso
 Notation Reference:
 @ref{Placing lyrics vertically}.


@@ -1034,7 +1020,7 @@ follows:
   <<
     \new Lyrics = "lyrics" \with {
       % lyrics above a staff should have this override
   <<
     \new Lyrics = "lyrics" \with {
       % lyrics above a staff should have this override

-      \override VerticalAxisGroup #'staff-affinity = #DOWN
+      \override VerticalAxisGroup.staff-affinity = #DOWN

     }
     \new Staff {
       \new Voice = "melody" {
     }
     \new Staff {
       \new Voice = "melody" {


@@ -1065,7 +1051,7 @@ is an example of the second method:
     \new Lyrics = "sopranos"
     \new Lyrics = "contraltos" \with {
       % lyrics above a staff should have this override
     \new Lyrics = "sopranos"
     \new Lyrics = "contraltos" \with {
       % lyrics above a staff should have this override

-      \override VerticalAxisGroup #'staff-affinity = #DOWN
+      \override VerticalAxisGroup.staff-affinity = #DOWN

     }
     \new Staff {
       \new Voice = "contraltos" {
     }
     \new Staff {
       \new Voice = "contraltos" {


@@ -1087,20 +1073,21 @@ is an example of the second method:
 @end lilypond
 
 Other combinations of lyrics and staves may be generated by
 @end lilypond
 
 Other combinations of lyrics and staves may be generated by

-elaborating these examples, or by examining the
-@rlearning{Vocal ensembles} templates in the Learning Manual.
+elaborating these examples, or by examining the templates in the
+Learning Manual, see @rlearning{Vocal ensembles templates}.

 
 @snippets
 
 @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:
 
 @seealso
 Learning Manual:

-@rlearning{Vocal ensembles}.
+@rlearning{Vocal ensembles templates}.

 
 Notation Reference:
 
 Notation Reference:

-@ref{Aligning contexts},
-@ref{Creating contexts}.
+@ref{Context layout order},
+@ref{Creating and referencing contexts}.
+

 
 @node Placing syllables horizontally
 @unnumberedsubsubsec Placing syllables horizontally
 
 @node Placing syllables horizontally
 @unnumberedsubsubsec Placing syllables horizontally


@@ -1114,7 +1101,7 @@ To increase the spacing between lyrics, set the
 @lilypond[relative=1,verbatim,quote,ragged-right]
 {
   c c c c
 @lilypond[relative=1,verbatim,quote,ragged-right]
 {
   c c c c

-  \override Lyrics.LyricSpace #'minimum-distance = #1.0
+  \override Lyrics.LyricSpace.minimum-distance = #1.0

   c c c c
 }
 \addlyrics {
   c c c c
 }
 \addlyrics {


@@ -1140,14 +1127,14 @@ To make this change for all lyrics in the score, set the property in the
   \layout {
     \context {
       \Lyrics
   \layout {
     \context {
       \Lyrics

-      \override LyricSpace #'minimum-distance = #1.0
+      \override LyricSpace.minimum-distance = #1.0

     }
   }
 }
 @end lilypond
 
 @snippets
     }
   }
 }
 @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
 {lyrics-alignment.ly}
 
 @c TODO: move to LSR -vv


@@ -1157,7 +1144,7 @@ requires additional calculations.  To speed up processing slightly, this
 feature can be disabled:
 
 @example
 feature can be disabled:
 
 @example

-\override Score.PaperColumn #'keep-inside-line = ##f
+\override Score.PaperColumn.keep-inside-line = ##f

 @end example
 
 To make lyrics avoid bar lines as well, use
 @end example
 
 To make lyrics avoid bar lines as well, use


@@ -1168,23 +1155,11 @@ To make lyrics avoid bar lines as well, use
     \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"
     \Lyrics
       \consists "Bar_engraver"
       \consists "Separating_line_group_engraver"

-      \override BarLine #'transparent = ##t
+      \override BarLine.transparent = ##t

   @}
 @}
 @end example
 
   @}
 @}
 @end example
 

-@c TODO Create and add lsr example of lyricMelismaAlignment
-@c It's used like this to center-align all lyric syllables,
-@c even when notes are tied. -td
-
-@ignore
-\layout
-{
-     \context { \Score lyricMelismaAlignment = #0 }
-}
-@end ignore
-
-

 @node Lyrics and repeats
 @unnumberedsubsubsec Lyrics and repeats
 
 @node Lyrics and repeats
 @unnumberedsubsubsec Lyrics and repeats
 


@@ -1335,6 +1310,54 @@ More verses may be added in a similar way:
 }
 @end lilypond
 
 }
 @end lilypond
 

+@cindex alignBelowContext
+@funindex alignBelowContext
+
+However, if this construct is embedded within a multi-staved
+context such as a @code{ChoirStaff} the lyrics of the second and
+third verses will appear beneath the bottom staff.
+
+To position them correctly use @code{alignBelowContext}:
+
+@lilypond[verbatim,quote]
+\score {
+  <<
+    \new Staff {
+      \new Voice = "melody" {
+        \relative c'' {
+         a4 a a a
+         \repeat volta 3 { b4 b b b }
+          c4 c c c
+       }
+      }
+    }
+    \new Lyrics = "firstVerse" \lyricsto "melody" {
+      Not re -- peat -- ed.
+      <<
+        { The first time words.        }
+       \new Lyrics = "secondVerse"
+        \with { alignBelowContext = #"firstVerse" } {
+         \set associatedVoice = "melody"
+         Sec -- ond time words.
+       }
+       \new Lyrics = "thirdVerse"
+        \with { alignBelowContext = #"secondVerse" } {
+         \set associatedVoice = "melody"
+         The third time words.
+       }
+      >>
+      The end sec -- tion.
+    }
+    \new Voice = "harmony" {
+      \relative c' {
+        f4 f f f \repeat volta 2 { g8 g g4 g2 } a4 a8. a16 a2
+      }
+    }
+  >>
+}
+@end lilypond
+
+

 
 @c TODO positioning a common line of lyrics
 
 
 @c TODO positioning a common line of lyrics
 


@@ -1611,6 +1634,18 @@ attaching lyrics to those specific contexts:
 }
 @end lilypond
 
 }
 @end lilypond
 

+It is common in choral music to have a voice part split for
+several measures.  The @code{<< @{@dots{}@} \\ @{@dots{}@} >>}
+construct, where the two (or more) musical expressions are
+separated by double backslashes, might seem the proper way to
+set the split voices.  This construct, however, will assign
+@strong{all} the expressions within it to @strong{NEW Voice
+contexts} which will result in @emph{no lyrics} being set for
+them since the lyrics will be set to the original voice context
+-- not, typically, what one wants.  The temporary polyphonic
+passage is the proper construct to use, see section
+@emph{Temporary polyphonic passages} in @ref{Single-staff polyphony}.
+

 
 @node Stanzas
 @subsection Stanzas
 
 @node Stanzas
 @subsection Stanzas


@@ -1840,9 +1875,9 @@ within the lyrics by setting the @code{associatedVoice} property:
     <<
       \new Voice = "alternative" {
         \voiceOne
     <<
       \new Voice = "alternative" {
         \voiceOne

-        \times 2/3 {
+        \tuplet 3/2 {

           % show associations clearly.
           % show associations clearly.

-          \override NoteColumn #'force-hshift = #-3
+          \override NoteColumn.force-hshift = #-3

           f8 f g
         }
       }
           f8 f g
         }
       }


@@ -1953,7 +1988,7 @@ output in LilyPond.
 
 @lilypond[ragged-right,quote,verbatim]
 melody = \relative c' {
 
 @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 {
 }
 
 text = \lyricmode {


@@ -1972,7 +2007,7 @@ text = \lyricmode {
 \markup {
   \fill-line {
     \hspace #0.1 % moves the column off the left margin;
 \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 {
      \column {
       \line { \bold "2."
         \column {


@@ -1980,7 +2015,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
           "It has two lines."
         }
       }

-      \hspace #0.1 % adds vertical spacing between verses
+      \combine \null \vspace #0.1 % adds vertical spacing between verses

       \line { \bold "3."
         \column {
           "This is verse three."
       \line { \bold "3."
         \column {
           "This is verse three."


@@ -1988,17 +2023,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."
         }
       }
       \line { \bold "4."
         \column {
           "This is verse four."
           "It has two lines."
         }
       }

-      \hspace #0.1 % adds vertical spacing between verses
+      \combine \null \vspace #0.1 % adds vertical spacing between verses

       \line { \bold "5."
         \column {
           "This is verse five."
       \line { \bold "5."
         \column {
           "This is verse five."


@@ -2007,7 +2040,7 @@ text = \lyricmode {
       }
     }
   \hspace #0.1 % gives some extra space on the right margin;
       }
     }
   \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
   }
 }
 @end lilypond


@@ -2087,6 +2120,7 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
 Snippets:
 @rlsr{Vocal music}.
 

+

 @node Lead sheets
 @unnumberedsubsubsec Lead sheets
 
 @node Lead sheets
 @unnumberedsubsubsec Lead sheets
 


@@ -2094,7 +2128,7 @@ Lead sheets may be printed by combining vocal parts and
 @q{chord mode}; this syntax is explained in @ref{Chord notation}.
 
 @snippets
 @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
 {simple-lead-sheet.ly}
 
 @seealso


@@ -2126,8 +2160,8 @@ etc.
 Choral music is usually notated on two, three or four staves within
 a @code{ChoirStaff} group.  Accompaniment, if required, is placed
 beneath in a @code{PianoStaff} group, which is usually reduced in
 Choral music is usually notated on two, three or four staves within
 a @code{ChoirStaff} group.  Accompaniment, if required, is placed
 beneath in a @code{PianoStaff} group, which is usually reduced in

-size for @emph{a capella} choral works.  The notes for each vocal
-part are placed in a @code{Voice} context, with each staff
+size for rehearsal of @emph{a cappella} choral works.  The notes for
+each vocal part are placed in a @code{Voice} context, with each staff

 being given either a single vocal part (i.e., one @code{Voice}) or
 a pair of vocal parts (i.e., two @code{Voice}s).
 
 being given either a single vocal part (i.e., one @code{Voice}) or
 a pair of vocal parts (i.e., two @code{Voice}s).
 


@@ -2146,7 +2180,7 @@ the Learning Manual, see @rlearning{Four-part SATB vocal score}.
 @item
 Several templates suitable for various styles of choral music can
 also be found in the Learning Manual, see
 @item
 Several templates suitable for various styles of choral music can
 also be found in the Learning Manual, see

-@rlearning{Vocal ensembles}.
+@rlearning{Vocal ensembles templates}.

 
 @item
 For information about @code{ChoirStaff} and @code{PianoStaff} see
 
 @item
 For information about @code{ChoirStaff} and @code{PianoStaff} see


@@ -2162,6 +2196,11 @@ the higher part will be directed up and those of the lower part
 down.  To do this, use @code{\voiceOne} and @code{\voiceTwo}.  See
 @ref{Single-staff polyphony}.
 
 down.  To do this, use @code{\voiceOne} and @code{\voiceTwo}.  See
 @ref{Single-staff polyphony}.
 

+@item
+When a vocal part temporarily splits, you should use
+@emph{Temporary polyphonic passages}
+(see @ref{Single-staff polyphony}).
+

 @end itemize
 
 @predefined
 @end itemize
 
 @predefined


@@ -2172,7 +2211,7 @@ down.  To do this, use @code{\voiceOne} and @code{\voiceTwo}.  See
 @seealso
 Learning Manual:
 @rlearning{Four-part SATB vocal score},
 @seealso
 Learning Manual:
 @rlearning{Four-part SATB vocal score},

-@rlearning{Vocal ensembles}.
+@rlearning{Vocal ensembles templates}.

 
 Notation Reference:
 @ref{Context layout order},
 
 Notation Reference:
 @ref{Context layout order},


@@ -2188,6 +2227,7 @@ Internals Reference:
 @rinternals{Lyrics},
 @rinternals{PianoStaff}.
 
 @rinternals{Lyrics},
 @rinternals{PianoStaff}.
 

+

 @node Score layouts for choral
 @unnumberedsubsubsec Score layouts for choral
 
 @node Score layouts for choral
 @unnumberedsubsubsec Score layouts for choral
 


@@ -2251,8 +2291,8 @@ above their respective staves, as shown here:
   \layout {
     \context {
       \Score
   \layout {
     \context {
       \Score

-      \override DynamicText #'direction = #UP
-      \override DynamicLineSpanner #'direction = #UP
+      \override DynamicText.direction = #UP
+      \override DynamicLineSpanner.direction = #UP

     }
   }
 }
     }
   }
 }


@@ -2283,7 +2323,7 @@ Internals Reference:
 
 @cindex voices, divided
 
 
 @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
 {using-arpeggiobracket-to-make-divisi-more-visible.ly}
 
 @seealso


@@ -2372,10 +2412,10 @@ For details of other page formatting properties, see
 @ref{Page layout}.
 
 @item
 @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
 
 
 @end itemize
 


@@ -2386,6 +2426,7 @@ Musical Glossary:
 @rglos{transposing instrument}.
 
 Notation Reference:
 @rglos{transposing instrument}.
 
 Notation Reference:

+@ref{Creating footnotes},

 @ref{Grouping staves},
 @ref{Hiding staves},
 @ref{Instrument transpositions},
 @ref{Grouping staves},
 @ref{Hiding staves},
 @ref{Instrument transpositions},


@@ -2462,7 +2503,7 @@ indicate each change.
   #`((instrumentTransposition . ,(ly:make-pitch -1 0 0))
      (shortInstrumentName . "Kas.")
      (clefGlyph . "clefs.G")
   #`((instrumentTransposition . ,(ly:make-pitch -1 0 0))
      (shortInstrumentName . "Kas.")
      (clefGlyph . "clefs.G")

-     (clefOctavation . -7)
+     (clefTransposition . -7)

      (middleCPosition . 1)
      (clefPosition . -2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar"))
      (middleCPosition . 1)
      (clefPosition . -2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Kaspar"))


@@ -2472,11 +2513,11 @@ indicate each change.
   #`((instrumentTransposition . ,(ly:make-pitch 0 0 0))
      (shortInstrumentName . "Mel.")
      (clefGlyph . "clefs.F")
   #`((instrumentTransposition . ,(ly:make-pitch 0 0 0))
      (shortInstrumentName . "Mel.")
      (clefGlyph . "clefs.F")

-     (clefOctavation . 0)
+     (clefTransposition . 0)

      (middleCPosition . 6)
      (clefPosition . 2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior"))
      (middleCPosition . 6)
      (clefPosition . 2)
      (instrumentCueName . ,(markup #:fontsize 1 #:smallCaps "Melchior"))

-     (midiInstrument . "voice aahs"))
+     (midiInstrument . "choir aahs"))

 
 \relative c' {
   \instrumentSwitch "kaspar"
 
 \relative c' {
   \instrumentSwitch "kaspar"


@@ -2498,6 +2539,7 @@ Notation Reference:
 Extending LilyPond:
 @rextend{Markup construction in Scheme}.
 
 Extending LilyPond:
 @rextend{Markup construction in Scheme}.
 

+

 @node Musical cues
 @unnumberedsubsubsec Musical cues
 
 @node Musical cues
 @unnumberedsubsubsec Musical cues
 


@@ -2529,7 +2571,10 @@ pianoRH = \relative c'' {
   c4. g8
   % position name of cue-ing instrument just before the cue notes,
   % and above the staff
   c4. g8
   % position name of cue-ing instrument just before the cue notes,
   % and above the staff

-  s1*0^\markup { \right-align { \tiny "Flute" } }
+  \new CueVoice {
+    \override InstrumentSwitch.self-alignment-X = #RIGHT
+    \set instrumentCueName = "Flute"
+  }

   \cueDuring "flute" #UP { g4 bes4 }
 }
 pianoLH = \relative c { c4 <c' e> e, <g c> }
   \cueDuring "flute" #UP { g4 bes4 }
 }
 pianoLH = \relative c { c4 <c' e> e, <g c> }


@@ -2568,7 +2613,11 @@ clarinet = \relative c' {
 pianoRH = \relative c'' {
   \transposition c'
   % position name of cue-ing instrument below the staff
 pianoRH = \relative c'' {
   \transposition c'
   % position name of cue-ing instrument below the staff

-  s1*0_\markup { \right-align { \tiny "Clar." } }
+  \new CueVoice {
+    \override InstrumentSwitch.self-alignment-X = #RIGHT
+    \override InstrumentSwitch.direction = #DOWN
+    \set instrumentCueName = "Clar."
+  }

   \cueDuring "clarinet" #DOWN { c4. g8 }
   g4 bes4
 }
   \cueDuring "clarinet" #DOWN { c4. g8 }
   g4 bes4
 }


@@ -2598,7 +2647,7 @@ possible to define a music function to reduce the amount of typing
 and to make the piano notes clearer.
 
 @snippets
 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
 {adding-orchestral-cues-to-a-vocal-score.ly}
 
 @seealso


@@ -2700,8 +2749,8 @@ dialogue = \lyricmode {
 \score {
   <<
     \new Lyrics \with {
 \score {
   <<
     \new Lyrics \with {

-      \override LyricText #'font-shape = #'italic
-      \override LyricText #'self-alignment-X = #LEFT
+      \override LyricText.font-shape = #'italic
+      \override LyricText.self-alignment-X = #LEFT

     }
     { \dialogue }
     \new Staff {
     }
     { \dialogue }
     \new Staff {


@@ -2767,7 +2816,7 @@ Chants often use quarter notes without stems to indicate the pitch,
 with the rhythm being taken from the spoken rhythm of the words.
 
 @lilypond[verbatim,quote]
 with the rhythm being taken from the spoken rhythm of the words.
 
 @lilypond[verbatim,quote]

-stemOff = { \override Staff.Stem #'transparent = ##t }
+stemOff = { \override Staff.Stem.transparent = ##t }

 
 \relative c' {
   \stemOff
 
 \relative c' {
   \stemOff


@@ -2801,7 +2850,7 @@ all staves remove the bar line engraver completely:
   \layout {
     \context {
       \Staff
   \layout {
     \context {
       \Staff

-      \remove Bar_engraver
+      \remove "Bar_engraver"

     }
   }
 }
     }
   }
 }


@@ -2813,7 +2862,7 @@ Bar lines can also be removed on a staff-by-staff basis:
 \score {
   \new ChoirStaff <<
     \new Staff
 \score {
   \new ChoirStaff <<
     \new Staff

-    \with { \remove Bar_engraver } {
+    \with { \remove "Bar_engraver" } {

       \relative c'' {
         a4 b c2 |
         a4 b c2 |
       \relative c'' {
         a4 b c2 |
         a4 b c2 |


@@ -2858,9 +2907,9 @@ a4 b c2
 \bar "'"
 a4 b c2
 a4 b c2
 \bar "'"
 a4 b c2
 a4 b c2

-\bar ":"
+\bar ";"

 a4 b c2
 a4 b c2

-\bar "dashed"
+\bar "!"

 a4 b c2
 \bar "||"
 @end lilypond
 a4 b c2
 \bar "||"
 @end lilypond


@@ -2871,23 +2920,23 @@ modern.  This uses a modified @code{\breathe} mark:
 
 @lilypond[verbatim,quote]
 divisioMinima = {
 
 @lilypond[verbatim,quote]
 divisioMinima = {

-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-minima
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-minima
+  \once \override BreathingSign.Y-offset = #0

   \breathe
 }
 divisioMaior = {
   \breathe
 }
 divisioMaior = {

-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maior
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-maior
+  \once \override BreathingSign.Y-offset = #0

   \breathe
 }
 divisioMaxima = {
   \breathe
 }
 divisioMaxima = {

-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::divisio-maxima
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::divisio-maxima
+  \once \override BreathingSign.Y-offset = #0

   \breathe
 }
 finalis = {
   \breathe
 }
 finalis = {

-  \once \override BreathingSign  #'stencil = #ly:breathing-sign::finalis
-  \once \override BreathingSign  #'Y-offset = #0
+  \once \override BreathingSign.stencil = #ly:breathing-sign::finalis
+  \once \override BreathingSign.Y-offset = #0

   \breathe
 }
 
   \breathe
 }
 


@@ -2905,7 +2954,7 @@ finalis = {
   \layout {
     \context {
       \Staff
   \layout {
     \context {
       \Staff

-      \remove Bar_engraver
+      \remove "Bar_engraver"

     }
   }
 }
     }
   }
 }


@@ -2925,9 +2974,9 @@ Chants usually omit the time signature and often omit the clef too.
   \layout {
     \context {
       \Staff
   \layout {
     \context {
       \Staff

-      \remove Bar_engraver
-      \remove Time_signature_engraver
-      \remove Clef_engraver
+      \remove "Bar_engraver"
+      \remove "Time_signature_engraver"
+      \remove "Clef_engraver"

     }
   }
 }
     }
   }
 }


@@ -3001,8 +3050,7 @@ global = {
       \layout {
         \context {
           \Score
       \layout {
         \context {
           \Score

-          \override SpacingSpanner
-          #'base-shortest-duration = #(ly:make-moment 1 2)
+          \override SpacingSpanner.base-shortest-duration = #(ly:make-moment 1/2)

         }
         \context {
           \Staff
         }
         \context {
           \Staff


@@ -3019,7 +3067,7 @@ of the following snippets.
 
 @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
 {chant-or-psalms-notation.ly}
 
 Canticles and other liturgical texts may be set more freely, and


@@ -3028,13 +3076,13 @@ are shown underneath and aligned with the notes.  If so, the notes
 are spaced in accordance with the syllables rather than the notes'
 durations.
 
 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
 Learning Manual:
 @rlearning{Visibility and color of objects},
 {ancient-notation-template----modern-transcription-of-gregorian-music.ly}
 
 @seealso
 Learning Manual:
 @rlearning{Visibility and color of objects},

-@rlearning{Vocal ensembles}.
+@rlearning{Vocal ensembles templates}.

 
 Notation Reference:
 @ref{Ancient notation},
 
 Notation Reference:
 @ref{Ancient notation},


@@ -3193,11 +3241,12 @@ The use of markup to center text, and arrange lines in columns is
 described in @ref{Formatting text}.
 
 Most of these elements are shown in one or other of the two verses
 described in @ref{Formatting text}.
 
 Most of these elements are shown in one or other of the two verses

-in the template, see @qq{Psalms} in @rlearning{Vocal ensembles}.
+in the template, see @rlearning{Psalms}.

 
 @seealso
 Learning Manual:
 
 @seealso
 Learning Manual:

-@rlearning{Vocal ensembles}.
+@rlearning{Psalms},
+@rlearning{Vocal ensembles templates}.

 
 Notation Reference:
 @ref{Fonts},
 
 Notation Reference:
 @ref{Fonts},


@@ -3213,7 +3262,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.
 
 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}
 
 
 {hymn-template.ly}