release commit

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

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 8ac4acb22f3c2ab29988286971e9c0302092e2ec..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
@@ -1034,7 +1034,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to
   }
   \paper {
     \context {
-      \StaffContext
+      \Staff
       \consists "Measure_grouping_engraver"
     }
   }
@@ -1943,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
 
@@ -2817,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
 }}}
@@ -3403,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
@@ -3540,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
 
@@ -3656,7 +3658,7 @@ for example,
 @example
   \paper @{
     \context @{
-      \VoiceContext
+      \Voice
       \consists Ambitus_engraver
     @}
   @}
@@ -3677,7 +3679,7 @@ This results in the following output
   >>
   \paper {
     \context {
-      \StaffContext
+      \Staff
       \consists Ambitus_engraver
     }
   }
@@ -3924,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]
@@ -4663,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
@@ -4893,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"
@@ -5260,7 +5262,7 @@ following table
        indent = 0.0
        raggedright = ##t
        \context {
-           \StaffContext
+           \Staff
            \remove Staff_symbol_engraver
            \remove Clef_engraver
            \remove Time_signature_engraver
@@ -5332,7 +5334,7 @@ as shown in the following example
 @example
 \paper @{
   \context @{
-     \StaffContext
+     \Staff
      \consists Custos_engraver
      Custos \override #'style = #'mensural
   @}
@@ -5351,7 +5353,7 @@ The result looks like this
     }
     \paper {
        \context {
-           \StaffContext
+           \Staff
            \consists Custos_engraver
        }
     }
@@ -5504,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
         @}
@@ -5545,7 +5547,7 @@ For example,
     }
     \paper {
         \context {
-            \VoiceContext
+            \Voice
             \remove Ligature_bracket_engraver
             \consists Mensural_ligature_engraver
         }
@@ -5633,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
@@ -5646,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
@@ -5675,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
@@ -5688,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
@@ -5709,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
@@ -5722,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
@@ -5746,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
@@ -5759,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
@@ -5785,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
@@ -5798,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
@@ -5819,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
@@ -5832,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
@@ -5857,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
@@ -5870,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
@@ -5896,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
@@ -5909,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
@@ -5934,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
@@ -5947,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
@@ -5968,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
@@ -5981,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
@@ -6005,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
@@ -6018,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
@@ -6043,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
@@ -6056,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
@@ -6077,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
@@ -6090,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
@@ -6114,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
@@ -6127,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
@@ -6148,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
@@ -6161,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
@@ -6186,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
@@ -6199,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
@@ -6220,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
@@ -6233,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
@@ -6258,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
@@ -6271,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
@@ -6292,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
@@ -6305,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
@@ -6330,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
@@ -6343,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
@@ -6364,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
@@ -6377,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
@@ -6398,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
@@ -6411,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
@@ -6435,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
@@ -6448,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
@@ -6469,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
@@ -6482,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
@@ -6503,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
@@ -6516,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
@@ -6540,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
@@ -6553,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
@@ -6574,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
@@ -6587,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
@@ -6608,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
@@ -6621,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
@@ -6645,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
@@ -6658,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
@@ -6679,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
@@ -6692,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
@@ -6713,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
@@ -6726,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
@@ -6750,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
@@ -6763,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
@@ -6784,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
@@ -6797,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
@@ -6818,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
@@ -6831,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
@@ -6855,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
@@ -6868,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
@@ -6889,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
@@ -6902,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
@@ -6927,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
@@ -6940,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
@@ -7369,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