Rerun scripts/auxiliar/update-with-convert-ly.sh

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

diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely
index 9f6eb4049df026718f0fd3cd5f0d40d7a6af8fc3..219cfb6fd40fb1cd326b8b83f963ff2c5ac5332c 100644 (file)
--- a/Documentation/notation/vocal.itely
+++ b/Documentation/notation/vocal.itely
@@ -7,12 +7,12 @@
     Guide, node Updating translation committishes..
 @end ignore
 
     Guide, node Updating translation committishes..
 @end ignore
 

-@c \version "2.13.36"
+@c \version "2.17.6"

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

-@c TODO: inspirational headword
+@lilypondfile[quote]{vocal-headword.ly}

 
 This section explains how to typeset vocal music, and make sure
 that the lyrics will be aligned with the notes of their melody.
 
 This section explains how to typeset vocal music, and make sure
 that the lyrics will be aligned with the notes of their melody.


@@ -43,7 +43,6 @@ This section discusses issues common to most types of vocal music.
 * Manual syllable durations::
 * Multiple syllables to one note::
 * Multiple notes to one syllable::
 * Manual syllable durations::
 * Multiple syllables to one note::
 * Multiple notes to one syllable::

-* Skipping notes::

 * Extenders and hyphens::
 @end menu
 
 * Extenders and hyphens::
 @end menu
 


@@ -57,17 +56,23 @@ that may arise in any type of vocal music.
 @itemize
 
 @item
 @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
 
 @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
 
 @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
 
 
 @end itemize
 


@@ -75,14 +80,25 @@ in @ref{Ambitus}.
 Music Glossary:
 @rglos{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}.
 
 Snippets:
 @rlsr{Vocal music}.
 

+

 @node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 
 @cindex lyrics, entering
 @cindex entering lyrics
 @node Entering lyrics
 @unnumberedsubsubsec Entering lyrics
 
 @cindex lyrics, entering
 @cindex entering lyrics

+@cindex formatting in lyrics
+@cindex lyrics, formatting

 @cindex punctuation in lyrics
 @cindex lyrics punctuation
 @cindex spaces in lyrics
 @cindex punctuation in lyrics
 @cindex lyrics punctuation
 @cindex spaces in lyrics


@@ -142,21 +158,21 @@ must be inserted around the period in @code{\override} commands.
 Do @emph{not} write
 
 @example
 Do @emph{not} write
 
 @example

-\override Score.LyricText #'font-shape = #'italic
+\override Score.LyricText.font-shape = #'italic

 @end example
 
 @noindent
 but instead use
 
 @example
 @end example
 
 @noindent
 but instead use
 
 @example

-\override Score . LyricText #'font-shape = #'italic
+\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.
 @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.

-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 }


@@ -183,6 +199,16 @@ combination of a backslash followed by one of @code{`}, @code{'},
 
 @c " to balance double quotes for not-so-bright context-sensitive editors
 
 
 @c " to balance double quotes for not-so-bright context-sensitive editors
 

+Great control over the appearance of lyrics comes from using
+@code{\markup} inside the lyrics themselves. For explanation of many
+options, see @ref{Formatting text}.
+
+@snippets
+
+@lilypondfile[verbatim,quote,ragged-right,texidoc,doctitle]
+{formatting-lyrics-syllables.ly}
+
+

 @seealso
 Learning Manual:
 @rlearning{Songs}.
 @seealso
 Learning Manual:
 @rlearning{Songs}.


@@ -190,12 +216,17 @@ Learning Manual:
 Notation Reference:
 @ref{Automatic syllable durations},
 @ref{Fonts},
 Notation Reference:
 @ref{Automatic syllable durations},
 @ref{Fonts},

+@ref{Formatting text},

 @ref{Input modes},
 @ref{Input modes},

-@ref{Manual syllable durations}.
+@ref{Manual syllable durations},
+@ref{Special characters}.

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

+Snippets:
+@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


@@ -308,9 +339,18 @@ specifying an associated voice, if one exists.  For details, see
 Learning Manual:
 @rlearning{Aligning lyrics to a melody}.
 
 Learning Manual:
 @rlearning{Aligning lyrics to a melody}.
 

+Notation Reference:
+@ref{Contexts explained},
+@ref{Automatic syllable durations},
+@ref{Stanzas},
+@ref{Manual syllable durations},
+@ref{Dialogue over music},
+@ref{Manual syllable durations}.
+

 Internals Reference:
 @rinternals{Lyrics}.
 
 Internals Reference:
 @rinternals{Lyrics}.
 

+

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


@@ -416,12 +456,14 @@ More stanzas can be added by adding more
 @code{\addlyrics} sections:
 
 
 @code{\addlyrics} sections:
 
 

-@lilypond[ragged-right,verbatim,relative=1,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.
 @end lilypond
 
 The command @code{\addlyrics} cannot handle polyphonic settings.


@@ -471,7 +513,9 @@ Here is an example demonstrating its use:
 @seealso
 Notation Reference:
 @ref{Extenders and hyphens},
 @seealso
 Notation Reference:
 @ref{Extenders and hyphens},

-@ref{Keeping contexts alive}.
+@ref{Keeping contexts alive},
+@ref{Placing lyrics vertically}.
+

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


@@ -569,20 +613,18 @@ Internals Reference:
 In order to assign more than one syllable to a single note with
 spaces between the syllables, you can surround the phrase with
 quotes or use a @code{_} character.  Alternatively, you can use
 In order to assign more than one syllable to a single note with
 spaces between the syllables, you can surround the phrase with
 quotes or use a @code{_} character.  Alternatively, you can use

-code the tilde symbol (@code{~}) to get a lyric tie.  The lyric
-tie is implemented with the Unicode character U+203F, so be
-sure to have a font (like DejaVuLGC) installed that includes this
-glyph.
+the tilde symbol (@code{~}) to get a lyric tie.

 
 

-@lilypond[quote,ragged-right,relative=1,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]
+{
+  \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
 
 @end lilypond
 

-

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


@@ -605,7 +647,7 @@ left-aligned with the first note of the melisma.
 When a melisma occurs on a syllable other that the last one in a
 word, that syllable is usually joined to the following one with a
 hyphenated line.  This is indicated by placing a double hyphen,
 When a melisma occurs on a syllable other that the last one in a
 word, that syllable is usually joined to the following one with a
 hyphenated line.  This is indicated by placing a double hyphen,

-@code{--}, immediately after the syllable.
+@w{@code{--}}, immediately after the syllable.

 
 Alternatively, when a melisma occurs on the last or only syllable in
 a word an extender line is usually drawn from the end of the syllable
 
 Alternatively, when a melisma occurs on the last or only syllable in
 a word an extender line is usually drawn from the end of the syllable


@@ -652,6 +694,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


@@ -694,9 +738,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


@@ -719,8 +760,7 @@ to be added to the melisma.
 
 It is possible to have ties, slurs and manual beams in the melody
 without their indicating melismata.  To do this, set
 
 It is possible to have ties, slurs and manual beams in the melody
 without their indicating melismata.  To do this, set

-@code{melismaBusyProperties} and indicate the melismata with single
-underscores in the lyrics, one underscore for each extra note:
+@code{melismaBusyProperties}:

 
 @lilypond[relative=1,verbatim,quote]
 <<
 
 @lilypond[relative=1,verbatim,quote]
 <<


@@ -728,19 +768,42 @@ underscores in the lyrics, one underscore for each extra note:
     \time 3/4
     \set melismaBusyProperties = #'()
     c4 d ( e )
     \time 3/4
     \set melismaBusyProperties = #'()
     c4 d ( e )

-    g8 [ f ] f4( e)
-    d e ~ e
+    g8 [ f ] f4 ~ f

   }
   \new Lyrics \lyricsto "melody" {
   }
   \new Lyrics \lyricsto "melody" {

-    Ky -- _ _ _ _ ri -- _ _ e __ _
+    Ky -- ri -- e e -- le -- i -- son

   }
 >>
 @end lilypond
 
 Other settings for @code{melismaBusyProperties} can be used to
   }
 >>
 @end lilypond
 
 Other settings for @code{melismaBusyProperties} can be used to

-include or exclude ties, slurs, and beams from the automatic
-detection of melismata; see @code{melismaBusyProperties} in
-@rinternals{Tunable context properties}.
+selectively include or exclude ties, slurs, and beams from the
+automatic detection of melismata; see @code{melismaBusyProperties}
+in @rinternals{Tunable context properties}.
+
+Alternatively, if all melismata indications are to be ignored,
+@code{ignoreMelismata} may be set true;
+see @ref{Stanzas with different rhythms}.
+
+If a melisma is required during a passage in which
+@code{melismaBusyProperties} is active, it may be indicated by
+placing a single underscore in the lyrics for each note which
+should be included in the melisma:
+
+@lilypond[relative=1,verbatim,quote]
+<<
+  \new Voice = "melody" {
+    \time 3/4
+    \set melismaBusyProperties = #'()
+    c4 d ( e )
+    g8 [ f ] ~ f4 ~ f
+  }
+  \new Lyrics \lyricsto "melody" {
+    Ky -- ri -- _ e __ _ _ _
+  }
+>>
+@end lilypond
+

 
 @predefined
 
 
 @predefined
 


@@ -759,35 +822,16 @@ Learning Manual:
 Notation Reference:
 @ref{Aligning lyrics to a melody},
 @ref{Automatic syllable durations},
 Notation Reference:
 @ref{Aligning lyrics to a melody},
 @ref{Automatic syllable durations},

-@ref{Setting automatic beam behavior}.
+@ref{Setting automatic beam behavior},
+@ref{Stanzas with different rhythms}.

 
 Internals Reference:
 @rinternals{Tunable context properties}.
 
 @knownissues
 
 Internals Reference:
 @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.
 

-@node Skipping notes
-@unnumberedsubsubsec Skipping notes
-
-Making a lyric line run slower than the melody can be achieved by
-inserting @code{\skip}s into the lyrics.  For every @code{\skip},
-the text will be delayed by another note.  The @code{\skip} command
-must be followed by a valid duration, but this is ignored when
-@code{\skip} is used in lyrics which derive their durations from the
-notes in an associated melody through @code{\addlyrics} or
-@code{\lyricsto}.
-
-@lilypond[verbatim,ragged-right,quote]
-\relative c' { c c g' }
-\addlyrics {
-  twin -- \skip 4
-  kle
-}
-@end lilypond
-

 
 @node Extenders and hyphens
 @unnumberedsubsubsec Extenders and hyphens
 
 @node Extenders and hyphens
 @unnumberedsubsubsec Extenders and hyphens


@@ -825,7 +869,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},


@@ -919,7 +962,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}.


@@ -959,8 +1001,9 @@ context:
 @end lilypond
 
 Lyrics may be positioned above the staff using one of
 @end lilypond
 
 Lyrics may be positioned above the staff using one of

-two methods.  The simplest is to use the same syntax as
-above and explicitly specify the position of the lyrics:
+two methods.  The simplest (and preferred) method
+is to use the same syntax as above and explicitly
+specify the position of the lyrics:

 
 @lilypond[quote,verbatim]
 \score {
 
 @lilypond[quote,verbatim]
 \score {


@@ -988,7 +1031,10 @@ follows:
 @lilypond[quote,verbatim]
 \score {
   <<
 @lilypond[quote,verbatim]
 \score {
   <<

-    \new Lyrics = "lyrics"
+    \new Lyrics = "lyrics" \with {
+      % lyrics above a staff should have this override
+      \override VerticalAxisGroup.staff-affinity = #DOWN
+    }

     \new Staff {
       \new Voice = "melody" {
         \relative c'' { c4 c c c }
     \new Staff {
       \new Voice = "melody" {
         \relative c'' { c4 c c c }


@@ -1016,7 +1062,10 @@ is an example of the second method:
       }
     }
     \new Lyrics = "sopranos"
       }
     }
     \new Lyrics = "sopranos"

-    \new Lyrics = "contraltos"
+    \new Lyrics = "contraltos" \with {
+      % lyrics above a staff should have this override
+      \override VerticalAxisGroup.staff-affinity = #DOWN
+    }

     \new Staff {
       \new Voice = "contraltos" {
         \relative c'' { a4 a a a }
     \new Staff {
       \new Voice = "contraltos" {
         \relative c'' { a4 a a a }


@@ -1040,27 +1089,32 @@ 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
 @rlearning{Vocal ensembles} templates in the Learning Manual.
 

+@snippets
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{obtaining-2.12-lyrics-spacing-in-newer-versions.ly}
+

 @seealso
 Learning Manual:
 @rlearning{Vocal ensembles}.
 
 Notation Reference:
 @seealso
 Learning Manual:
 @rlearning{Vocal ensembles}.
 
 Notation Reference:

-@ref{Aligning contexts},
+@ref{Context layout order},

 @ref{Creating contexts}.
 
 @ref{Creating contexts}.
 

+

 @node Placing syllables horizontally
 @unnumberedsubsubsec Placing syllables horizontally
 
 @cindex Spacing lyrics
 @cindex Lyrics, increasing space between
 
 @node Placing syllables horizontally
 @unnumberedsubsubsec Placing syllables horizontally
 
 @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=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 {


@@ -1086,24 +1140,24 @@ 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
 

-Checking to make sure that text scripts and lyrics are within the margins is
-a relatively large computational task.  To speed up processing, LilyPond does
-not perform such calculations by default; to enable it, use
+Checking to make sure that text scripts and lyrics are within the margins
+requires additional calculations.  To speed up processing slightly, this
+feature can be disabled:

 
 @example
 
 @example

-\override Score.PaperColumn #'keep-inside-line = ##t
+\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


@@ -1114,23 +1168,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
 


@@ -1219,24 +1261,9 @@ simply enter all the words:
 }
 @end lilypond
 
 }
 @end lilypond
 

-@cindex lyric skip
-@funindex \skip
-

 When the words to a repeated volta section are different, the words
 When the words to a repeated volta section are different, the words

-to each repeat must be entered in separate @code{Lyrics} contexts.
-Earlier unrepeated sections must be skipped in the second and
-subsequent repeats.  The easiest way to skip several notes is to
-use @code{\repeat unfold} around the @code{\skip} command.
-
-Note: do not use an underscore, @code{_}, to skip notes in this
-particular case.  As this syntax indicates a melisma, it will cause
-the preceding syllable to be left-aligned.
-
-@warning{The @code{@bs{}skip} command must be followed by a number,
-but this number is ignored in lyrics which derive their durations
-from the notes in an associated melody through @code{\addlyrics} or
-@code{\lyricsto}.  Each @code{@bs{}skip} skips a single note of any
-value, irrespective of the value of the following number.}
+to each repeat must be entered in separate @code{Lyrics} contexts,
+correctly nested in parallel sections:

 
 @lilypond[verbatim,quote]
 \score {
 
 @lilypond[verbatim,quote]
 \score {


@@ -1249,69 +1276,103 @@ value, irrespective of the value of the following number.}
         }
       }
     }
         }
       }
     }

-    \new Lyrics {
-      \lyricsto "melody" {
-        Not re -- peat -- ed.
-        The first time words.
-      }
+    \new Lyrics \lyricsto "melody" {
+      Not re -- peat -- ed.
+      <<
+       { The first time words. }
+       \new Lyrics {
+         \set associatedVoice = "melody"
+         Sec -- ond time words.
+       }
+      >>

     }
     }

-    \new Lyrics {
-      \lyricsto "melody" {
-        % skip 4 notes of any duration
-        \repeat unfold 4 { \skip 1 }
-        Sec -- ond time words.
+  >>
+}
+@end lilypond
+
+More verses may be added in a similar way:
+
+@lilypond[verbatim,quote]
+\score {
+  <<
+    \new Staff {
+      \new Voice = "singleVoice" {
+        \relative c'' {
+         a4 a a a
+         \repeat volta 3 { b4 b b b }
+          c4 c c c
+       }

       }
     }
       }
     }

+    \new Lyrics \lyricsto "singleVoice" {
+      Not re -- peat -- ed.
+      <<
+        { The first time words.        }
+       \new Lyrics {
+         \set associatedVoice = "singleVoice"
+         Sec -- ond time words.
+       }
+       \new Lyrics {
+         \set associatedVoice = "singleVoice"
+         The third time words.
+       }
+      >>
+      The end sec -- tion.
+    }

   >>
 }
 @end lilypond
 
   >>
 }
 @end lilypond
 

-@cindex lyrics, repeating with a temporary voice
+@cindex alignBelowContext
+@funindex alignBelowContext

 
 

-An alternative way, which avoids skips and having to count notes,
-is to use a temporary voice for the repeated section.  This may be
-preferable if the earlier sections are still subject to change.  A
-temporary voice can be inserted anywhere in the main music stream
-in parallel with it, as shown below, but it may be necessary to
-keep the main voice alive in complex scores when using this
-technique; see @ref{Keeping contexts alive}.
+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.

 
 

-@lilypond[verbatim,quote,ragged-right]
+To position them correctly use @code{alignBelowContext}:
+
+@lilypond[verbatim,quote]

 \score {
   <<
     \new Staff {
 \score {
   <<
     \new Staff {

-      \new Voice = "singleVoice" {
-        \relative c'' { a4 a a a }
-        \new Voice = "repeatVoice" {
-          \relative c'' \repeat volta 3 { b4 b b b }
-        }
-        \relative c'' { c4 c c c }
+      \new Voice = "melody" {
+        \relative c'' {
+         a4 a a a
+         \repeat volta 3 { b4 b b b }
+          c4 c c c
+       }

       }
     }
       }
     }

-    \new Lyrics <<
-      \lyricsto "singleVoice" {
-        Not re -- peat -- ed.
-        The end sec -- tion.
-      }
-      \lyricsto "repeatVoice" {
-        The first time words.
-      }
-    >>
-    \new Lyrics {
-      \lyricsto "repeatVoice" {
-        Sec -- ond time words.
-      }
+    \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 Lyrics {
-      \lyricsto "repeatVoice" {
-        The third time words.
+    \new Voice = "harmony" {
+      \relative c' {
+        f4 f f f \repeat volta 2 { g8 g g4 g2 } a4 a8. a16 a2

       }
     }
   >>
 }
 @end lilypond
 
       }
     }
   >>
 }
 @end lilypond
 

-@c TODO lowering a common line of lyrics
+
+
+@c TODO positioning a common line of lyrics

 
 @subheading Repeats with alternative endings
 
 
 @subheading Repeats with alternative endings
 


@@ -1346,10 +1407,24 @@ same structure can be used for both the lyrics and music.
 }
 @end lilypond
 
 }
 @end lilypond
 

+@funindex \skip
+@cindex skipping notes in lyrics
+@cindex lyrics, skipping notes
+

 But when the repeated section has different words, a repeat
 construct cannot be used around the words and @code{\skip} commands
 But when the repeated section has different words, a repeat
 construct cannot be used around the words and @code{\skip} commands

-have to be inserted manually as described in the previous section to
-skip over the notes in the alternative sections which do not apply.
+have to be inserted manually to skip over the notes in the
+alternative sections which do not apply.
+
+Note: do not use an underscore, @code{_}, to skip notes -- an
+underscore indicates a melisma, causing the preceding syllable
+to be left-aligned.
+
+@warning{The @code{@bs{}skip} command must be followed by a number,
+but this number is ignored in lyrics which derive their durations
+from the notes in an associated melody through @code{\addlyrics} or
+@code{\lyricsto}.  Each @code{@bs{}skip} skips a single note of any
+value, irrespective of the value of the following number.}

 
 @lilypond[verbatim,quote,ragged-right]
 \score {
 
 @lilypond[verbatim,quote,ragged-right]
 \score {


@@ -1498,6 +1573,10 @@ alternative sections these must be inserted manually.
 }
 @end lilypond
 
 }
 @end lilypond
 

+@seealso
+Notation Reference:
+@ref{Keeping contexts alive},
+@ref{Repeats}.

 
 
 @node Divisi lyrics
 
 
 @node Divisi lyrics


@@ -1642,9 +1721,9 @@ stanzaOneThree =  {
 
 Stanzas differing in loudness may be indicated by putting a
 dynamics mark before each stanza.  In LilyPond, everything coming in
 
 Stanzas differing in loudness may be indicated by putting a
 dynamics mark before each stanza.  In LilyPond, everything coming in

-front of a stanza goes into the @code{StanzaNumber} object; dynamics marks
-are no different.  For technical reasons, you have to set the stanza
-outside @code{\lyricmode}:
+front of a stanza goes into the @code{StanzaNumber} object; dynamics
+marks are no different.  For technical reasons, you have to set the
+stanza outside @code{\lyricmode}:

 
 @lilypond[quote,ragged-right,verbatim]
 text = {
 
 @lilypond[quote,ragged-right,verbatim]
 text = {


@@ -1671,7 +1750,8 @@ 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
 
 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[ragged-right,quote,verbatim,relative=2]
 \new Voice {
 
 @lilypond[ragged-right,quote,verbatim,relative=2]
 \new Voice {


@@ -1729,28 +1809,34 @@ are to be ignored.
 
 @subsubheading Adding syllables to grace notes
 
 
 @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]
 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
 @end lilypond
 
 @knownissues


@@ -1792,7 +1878,7 @@ within the lyrics by setting the @code{associatedVoice} property:
         \voiceOne
         \times 2/3 {
           % show associations clearly.
         \voiceOne
         \times 2/3 {
           % show associations clearly.

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

           f8 f g
         }
       }
           f8 f g
         }
       }


@@ -1819,10 +1905,11 @@ within the lyrics by setting the @code{associatedVoice} property:
 @end lilypond
 
 @noindent
 @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"
 
 @example
 \set associatedVoice = "alternative" % applies to "ran"


@@ -1902,7 +1989,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 {


@@ -1910,17 +1997,18 @@ text = \lyricmode {
   It has two lines.
 }
 
   It has two lines.
 }
 

-\score{ <<
+\score {
+  <<

     \new Voice = "one" { \melody }
     \new Lyrics \lyricsto "one" \text
     \new Voice = "one" { \melody }
     \new Lyrics \lyricsto "one" \text

-   >>
+  >>

   \layout { }
 }
 
 \markup {
   \fill-line {
     \hspace #0.1 % moves the column off the left margin;
   \layout { }
 }
 
 \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 {


@@ -1928,7 +2016,7 @@ text = \lyricmode {
           "It has two lines."
         }
       }
           "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."
       \line { \bold "3."
         \column {
           "This is verse three."


@@ -1936,17 +2024,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
+      \vspace #0.1 % adds vertical spacing between verses

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


@@ -1955,7 +2041,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


@@ -2011,8 +2097,7 @@ For entering stanzas, see @ref{Stanzas}.
 
 @item
 Songs are frequently printed with the chording indicated by chord
 
 @item
 Songs are frequently printed with the chording indicated by chord

-names above the staves.  This is described in
-@ref{Displaying chords}.
+names above the staves.  This is described in @ref{Displaying chords}.

 
 @item
 To print fret diagrams of the chords for guitar accompaniment or
 
 @item
 To print fret diagrams of the chords for guitar accompaniment or


@@ -2036,14 +2121,15 @@ Notation Reference:
 Snippets:
 @rlsr{Vocal music}.
 
 Snippets:
 @rlsr{Vocal music}.
 

+

 @node Lead sheets
 @unnumberedsubsubsec Lead sheets
 
 @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
 
 @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


@@ -2102,7 +2188,7 @@ For information about @code{ChoirStaff} and @code{PianoStaff} see
 @ref{Grouping staves}.
 
 @item
 @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
 described in @ref{Shape note heads}.
 
 @item


@@ -2137,6 +2223,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
 


@@ -2169,7 +2256,7 @@ the two systems.  See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
 
 @item
 For details of other page formatting properties, see

-@ref{Page formatting}.
+@ref{Page layout}.

 
 @end itemize
 
 
 @end itemize
 


@@ -2200,8 +2287,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

     }
   }
 }
     }
   }
 }


@@ -2215,7 +2302,7 @@ Notation Reference:
 @ref{Changing spacing},
 @ref{Displaying spacing},
 @ref{Fitting music onto fewer pages},
 @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},
 @ref{Score layout},
 @ref{Separating systems},
 @ref{Setting the staff size},


@@ -2232,7 +2319,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


@@ -2318,13 +2405,13 @@ See @ref{Separating systems}.
 
 @item
 For details of other page formatting properties, see
 
 @item
 For details of other page formatting properties, see

-@ref{Page formatting}.
+@ref{Page layout}.

 
 @item
 
 @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
 


@@ -2335,11 +2422,12 @@ 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{Nested staff groups},
 @ref{Grouping staves},
 @ref{Hiding staves},
 @ref{Instrument transpositions},
 @ref{Nested staff groups},

-@ref{Page formatting},
+@ref{Page layout},

 @ref{Separating systems},
 @ref{Transpose},
 @ref{Writing parts},
 @ref{Separating systems},
 @ref{Transpose},
 @ref{Writing parts},


@@ -2447,6 +2535,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
 


@@ -2478,7 +2567,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> }


@@ -2500,7 +2592,7 @@ If a transposing instrument is being quoted the instrument part should
 specify its key so the conversion of its cue notes will be done
 automatically.  The example below shows this transposition for a
 B-flat clarinet.  The notes in this example are low on the staff so
 specify its key so the conversion of its cue notes will be done
 automatically.  The example below shows this transposition for a
 B-flat clarinet.  The notes in this example are low on the staff so

-@code{#DOWN} is specified in @code{\cueDuring} (so the stems are
+@code{DOWN} is specified in @code{\cueDuring} (so the stems are

 down) and the instrument name is positioned below the staff.  Note
 also that the piano right-hand voice is explicitly declared.  This
 is because the cue notes in this example begin at the start of the
 down) and the instrument name is positioned below the staff.  Note
 also that the piano right-hand voice is explicitly declared.  This
 is because the cue notes in this example begin at the start of the


@@ -2517,7 +2609,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
 }


@@ -2547,7 +2643,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


@@ -2582,8 +2678,8 @@ declaring separate @code{CueVoice} contexts and using
 
 @cindex parlato
 @cindex Sprechgesang
 
 @cindex parlato
 @cindex Sprechgesang

-Such effects as @q{parlato} or @q{Sprechgesang} require performers to speak
-without pitch but still with rhythm; these are notated by cross
+Such effects as @q{parlato} or @q{Sprechgesang} require performers to
+speak without pitch but still with rhythm; these are notated by cross

 note heads, as demonstrated in @ref{Special note heads}.
 
 @c TODO add "marking-notes-on-spoken-parts" snippet -vv
 note heads, as demonstrated in @ref{Special note heads}.
 
 @c TODO add "marking-notes-on-spoken-parts" snippet -vv


@@ -2625,7 +2721,7 @@ to manually insert @code{\break}s and adjust the placing of the
 dialogue to avoid running into the right margin.  The final word of
 the last measure on a line should also be separated out, as above.
 
 dialogue to avoid running into the right margin.  The final word of
 the last measure on a line should also be separated out, as above.
 

-Here is an example illustating how this might be done.
+Here is an example illustrating how this might be done.

 
 @c This should be a snippet, but it can't be as it needs to be
 @c manually adjusted to suit the imposed line length.  -td
 
 @c This should be a snippet, but it can't be as it needs to be
 @c manually adjusted to suit the imposed line length.  -td


@@ -2649,8 +2745,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 {


@@ -2716,7 +2812,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


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

-      \remove Bar_engraver
+      \remove "Bar_engraver"

     }
   }
 }
     }
   }
 }


@@ -2762,7 +2858,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 |


@@ -2782,7 +2878,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
 
 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 |
 
 @lilypond[verbatim,quote,relative=2]
 a4 b c2 |


@@ -2807,9 +2903,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


@@ -2820,23 +2916,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
 }
 


@@ -2854,7 +2950,7 @@ finalis = {
   \layout {
     \context {
       \Staff
   \layout {
     \context {
       \Staff

-      \remove Bar_engraver
+      \remove "Bar_engraver"

     }
   }
 }
     }
   }
 }


@@ -2874,9 +2970,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"

     }
   }
 }
     }
   }
 }


@@ -2950,8 +3046,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


@@ -2968,7 +3063,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


@@ -2977,7 +3072,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.
 
 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
 {ancient-notation-template----modern-transcription-of-gregorian-music.ly}
 
 @seealso


@@ -3162,14 +3257,15 @@ 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}
 
 
 @node Ancient vocal music
 @subsection Ancient vocal music
 
 {hymn-template.ly}
 
 
 @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
 
 
 @c TODO