release commit

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 3757b978843f2b222ae0605643c49a02f2be7b84..d819668cbda53e98029ba328fef5f25381651af5 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -318,7 +318,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
   \paper {
     raggedright = ##t
     \context {
-      \StaffContext
+      \Staff
         \remove "Clef_engraver"
         \override StaffSymbol #'transparent = ##t 
         \override TimeSignature #'transparent = ##t
@@ -698,6 +698,18 @@ score by scanning for failed bar checks and incorrect durations.  To
 speed up this process, you can use @code{skipTypesetting}, described
 in the next section.
 
+It is also possible to redefine the meaning of @code{|}. This is done
+by assigning a music expression to @code{pipeSymbol},
+
+@lilypond
+pipeSymbol = \bar "||"
+
+\score {
+    \notes  { c'2 c'2 | c'2 c'2 | }
+}
+@end lilypond 
+
+
 @node Skipping corrected music
 @subsection Skipping corrected music
 
@@ -1022,7 +1034,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to
   }
   \paper {
     \context {
-      \StaffContext
+      \Staff
       \consists "Measure_grouping_engraver"
     }
   }
@@ -1424,6 +1436,8 @@ behavior can be changed by setting @code{allowBeamBreak}.
 Automatically kneed cross-staff beams cannot be used together with
 hidden staves.
 
+Beams do not avoid collisions with symbols around the notes, such as
+texts and accidentals.
 
 
 
@@ -1929,7 +1943,7 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to
   }
   \paper {
     \context {
-      \StaffContext \consists "Horizontal_bracket_engraver"
+      \Staff \consists "Horizontal_bracket_engraver"
 }}}
 @end lilypond
 
@@ -2241,7 +2255,7 @@ direction for this grace, so stems do not always point up.
 
 @example
 \new Staff @{
-   #(add-grace-property "Voice" Stem direction '())
+   #(add-grace-property 'Voice 'Stem 'direction '())
    @dots{}
 @}
 @end example
@@ -2662,9 +2676,8 @@ Patterns of a one and two measures are replaced by percent-like signs,
 patterns that divide the measure length are replaced by slashes
 
 @lilypond[quote,verbatim,raggedright]
-\context Voice { \repeat  "percent" 4  { c'4 }
-  \repeat "percent" 2 { c'2 es'2 f'4 fis'4 g'4 c''4 }
-}
+\repeat  "percent" 4  { c'4 }
+\repeat "percent" 2 { c'2 es'2 f'4 fis'4 g'4 c''4 }
 @end lilypond
 
 @seealso
@@ -2722,8 +2735,7 @@ an abbreviated name, and both be used in input files
   hihat hh bassdrum bd
 @end example
 @lilypond[quote,raggedright]
-        \new DrumStaff \drums {   hihat hh bassdrum bd
- }
+\new DrumStaff \drums { hihat hh bassdrum bd }
 @end lilypond
 
 The complete list of drum names is in the init file
@@ -2764,10 +2776,10 @@ polyphonic notation, described in @ref{Polyphony}, can also be used if
 the @internalsref{DrumVoices} are instantiated by hand first. For example, 
 
 @lilypond[quote,fragment,verbatim] 
-\drums \new DrumStaff <<
+\new DrumStaff <<
   \context DrumVoice = "1" {  s1 *2 }
   \context DrumVoice = "2" {  s1 *2 }
-  {
+  \drums {
     bd4 sn4 bd4 sn4
     <<
       { \repeat unfold 16 hh16 }
@@ -2805,7 +2817,7 @@ mus = \drums  { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc
     \paper {
     %% need to do this, because of indented @itemize
     linewidth= 9 \cm 
-    \context { \ScoreContext
+    \context { \Score
     \override LyricText #'font-family = #'typewriter
     \override BarNumber #'transparent =##T
 }}}
@@ -3373,6 +3385,9 @@ The definition of lyrics mode is too complex.
 @node The Lyrics context
 @subsection  The Lyrics context
 
+
+@c TODO: document \newlyrics
+
 Lyrics are printed by interpreting them in a @internalsref{Lyrics} context
 @example
  \context Lyrics \lyrics @dots{}
@@ -3388,7 +3403,7 @@ automatically.  In this case, it is no longer necessary to enter the
 correct duration for each syllable.  This is achieved by combining the
 melody and the lyrics with the @code{\lyricsto} expression
 @example
-\lyricsto @var{name} \new Lyrics @dots{} 
+\lyricsto @var{name} \new Lyrics \lyrics @dots{} 
 @end example
 
 This aligns the lyrics to the
@@ -3454,6 +3469,37 @@ be tuned with the property @code{melismaBusyProperties}. See
 @internalsref{Melisma_translator} in the program reference for more
 information.
 
+Lyrics can also be entered without @code{\lyricsto}. In this case the
+durations of each syllable must be entered explicitly, for example,
+
+@verbatim
+  play2 the4 game2.
+  sink2 or4 swim2.  
+@end verbatim
+
+Alignment to a melody can be specified with the @code{associatedVoice}
+property,
+
+@verbatim
+  \set associatedVoice = #"melody"
+@end verbatim 
+
+Here is an example demonstrating manual lyric durations,
+
+@lilypond[relative=1,verbatim,fragment]
+<< \context Voice = melody {
+     \time 3/4
+     c2 e4 g2.
+  } 
+  \new Lyrics \lyrics {
+    \set associatedVoice = #"melody"
+    play2 the4 game2.
+  }  >>
+@end lilypond
+
+
+
+
 When multiple stanzas are put on the same melody, it can happen that
 two stanzas have melismata in different locations. This can be
 remedied by switching off melismata for one
@@ -3494,6 +3540,8 @@ linked. This can be achieved either by using @code{\lyricsto} or by
 setting corresponding names for both contexts. The latter is explained
 in @ref{More stanzas}.
 
+@c TODO: document \new Staff << Voice \lyricsto >> bug
+
 @node More stanzas
 @subsection More stanzas
 
@@ -3530,11 +3578,11 @@ The complete example is shown here
     \notes \relative c'' \context Voice = duet {
       \time 3/4
        g2 e4 a2 f4 g2. }
-    \lyrics <<
-      \lyricsto "duet" \new Lyrics {
+    <<
+      \lyricsto "duet" \new Lyrics \lyrics {
         \set vocalName = "Bert"
         Hi, my name is Bert. }
-      \lyricsto "duet" \new Lyrics {
+      \lyricsto "duet" \new Lyrics \lyrics {
         \set vocalName = "Ernie"
         Ooooo, ch\'e -- ri, je t'aime. }
     >>
@@ -3552,7 +3600,7 @@ Stanza numbers can be added by setting @code{stanza}, e.g.
 <<
   \context Voice = duet {
     \time 3/4 g2 e4 a2 f4 g2. }
-   \lyrics \lyricsto "duet" \new Lyrics {
+    \lyricsto "duet" \new Lyrics \lyrics {
      \set stanza = "1. "
      Hi, my name is Bert. }
 >>
@@ -3610,7 +3658,7 @@ for example,
 @example
   \paper @{
     \context @{
-      \VoiceContext
+      \Voice
       \consists Ambitus_engraver
     @}
   @}
@@ -3631,7 +3679,7 @@ This results in the following output
   >>
   \paper {
     \context {
-      \StaffContext
+      \Staff
       \consists Ambitus_engraver
     }
   }
@@ -3878,7 +3926,7 @@ Modifiers can be mixed with additions
 @cindex @code{m}
 
 Since an unaltered 11 does not sound good when combined with an
-unaltered 13, the 11 is removed in this case (unless it is added
+unaltered 3, the 11 is removed in this case (unless it is added
 explicitly)
 @c
 @lilypond[quote,fragment,verbatim]
@@ -4617,8 +4665,8 @@ filtered. For example,
 @example
 \simultaneous @{
   @var{the music}
-  \apply #(remove-tag 'score) @var{the music}
-  \apply #(remove-tag 'part) @var{the music}
+  \applymusic #(remove-tag 'score) @var{the music}
+  \applymusic #(remove-tag 'part) @var{the music}
 @}
 @end example
 would yield
@@ -4847,11 +4895,11 @@ select ancient accidentals.   Supported styles are
         raggedright = ##t 
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context{
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \remove "Time_signature_engraver"
@@ -5214,7 +5262,7 @@ following table
        indent = 0.0
        raggedright = ##t
        \context {
-           \StaffContext
+           \Staff
            \remove Staff_symbol_engraver
            \remove Clef_engraver
            \remove Time_signature_engraver
@@ -5286,7 +5334,7 @@ as shown in the following example
 @example
 \paper @{
   \context @{
-     \StaffContext
+     \Staff
      \consists Custos_engraver
      Custos \override #'style = #'mensural
   @}
@@ -5305,7 +5353,7 @@ The result looks like this
     }
     \paper {
        \context {
-           \StaffContext
+           \Staff
            \consists Custos_engraver
        }
     }
@@ -5458,7 +5506,7 @@ To engrave white mensural ligatures, in the paper block the
 @example
     \paper @{
         \context @{
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Mensural_ligature_engraver
         @}
@@ -5499,7 +5547,7 @@ For example,
     }
     \paper {
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Mensural_ligature_engraver
         }
@@ -5587,11 +5635,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5600,7 +5648,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5629,11 +5677,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5642,7 +5690,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5663,11 +5711,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5676,7 +5724,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5700,11 +5748,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5713,7 +5761,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5739,11 +5787,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5752,7 +5800,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5773,11 +5821,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5786,7 +5834,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5811,11 +5859,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5824,7 +5872,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5850,11 +5898,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5863,7 +5911,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5888,11 +5936,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5901,7 +5949,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5922,11 +5970,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5935,7 +5983,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5959,11 +6007,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -5972,7 +6020,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -5997,11 +6045,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6010,7 +6058,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6031,11 +6079,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6044,7 +6092,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6068,11 +6116,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6081,7 +6129,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6102,11 +6150,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6115,7 +6163,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6140,11 +6188,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6153,7 +6201,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6174,11 +6222,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6187,7 +6235,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6212,11 +6260,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6225,7 +6273,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6246,11 +6294,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6259,7 +6307,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6284,11 +6332,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6297,7 +6345,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6318,11 +6366,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6331,7 +6379,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6352,11 +6400,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6365,7 +6413,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6389,11 +6437,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6402,7 +6450,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6423,11 +6471,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6436,7 +6484,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6457,11 +6505,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6470,7 +6518,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6494,11 +6542,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6507,7 +6555,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6528,11 +6576,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6541,7 +6589,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6562,11 +6610,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6575,7 +6623,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6599,11 +6647,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6612,7 +6660,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6633,11 +6681,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6646,7 +6694,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6667,11 +6715,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6680,7 +6728,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6704,11 +6752,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6717,7 +6765,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6738,11 +6786,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6751,7 +6799,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6772,11 +6820,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6785,7 +6833,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6809,11 +6857,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6822,7 +6870,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6843,11 +6891,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \paper {
         interscoreline = 1
         \context {
-            \ScoreContext
+            \Score
             \remove "Bar_number_engraver"
         }
         \context {
-            \StaffContext
+            \Staff
             \remove "Clef_engraver"
             \remove "Key_engraver"
             \override StaffSymbol #'transparent = ##t
@@ -6856,7 +6904,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
             minimumVerticalExtent = ##f
         }
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Vaticana_ligature_engraver
             \override NoteHead #'style = #'vaticana_punctum
@@ -6881,11 +6929,11 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
   \paper {
     interscoreline = 1
     \context {
-      \ScoreContext
+      \Score
       \remove "Bar_number_engraver"
     }
     \context {
-      \StaffContext
+      \Staff
       \remove "Clef_engraver"
       \remove "Key_engraver"
       \override StaffSymbol #'transparent = ##t
@@ -6894,7 +6942,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
       minimumVerticalExtent = ##f
     }
     \context {
-      \VoiceContext
+      \Voice
       \remove Ligature_bracket_engraver
       \consists Vaticana_ligature_engraver
       \override NoteHead #'style = #'vaticana_punctum
@@ -7323,7 +7371,7 @@ applying the function @code{notes-to-clusters} to a sequence of
 chords, e.g.
 @c
 @lilypond[quote,relative=2,verbatim]
-\apply #notes-to-clusters {  <c e > <b f'>  }
+\applymusic #notes-to-clusters {  <c e > <b f'>  }
 @end lilypond
 
 The following example (from