From 677031b7d5fd1806ca5d72bb6cbc37b3aacd5071 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 27 May 2004 17:48:16 +0000 Subject: [PATCH] * Documentation/user/notation.itely (Chords mode): typo: 13 -> 3. * Documentation/user/changing-defaults.itely (Horizontal spacing): document spacing override hack. --- Documentation/user/changing-defaults.itely | 8 +- Documentation/user/introduction.itely | 16 +- Documentation/user/music-glossary.tely | 2 +- Documentation/user/notation.itely | 252 +++++++++--------- input/les-nereides.ly | 6 +- .../E.Satie/petite-ouverture-a-danser.ly | 4 +- input/mutopia/F.Schubert/morgenlied.ly | 10 +- input/mutopia/F.Schubert/standchen.ly | 2 +- .../J.S.Bach/baerenreiter-sarabande.ly | 8 +- input/mutopia/J.S.Bach/bwv940.ly | 4 +- input/mutopia/J.S.Bach/wtk1-fugue2.ly | 4 +- input/mutopia/R.Schumann/romanze-op28-2.ly | 6 +- input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly | 6 +- input/no-notation/midi-volume-equaliser.ly | 2 +- input/no-notation/recording.ly | 4 +- input/puer-fragment.ly | 4 +- input/regression/ambitus.ly | 10 +- input/regression/arpeggio-collision.ly | 4 +- input/regression/auto-beam.ly | 4 +- input/regression/bar-number.ly | 4 +- .../regression/completion-heads-polyphony.ly | 4 +- input/regression/completion-heads.ly | 4 +- input/regression/custos.ly | 4 +- input/regression/glissando.ly | 4 +- input/regression/hara-kiri-pianostaff.ly | 2 +- input/regression/lyric-hyphen-break.ly | 4 +- input/regression/lyrics-bar.ly | 6 +- input/regression/measure-grouping.ly | 4 +- .../multi-measure-rest-instr-name.ly | 4 +- input/regression/multi-measure-rest.ly | 4 +- input/regression/new-markup-scheme.ly | 4 +- input/regression/note-group-bracket.ly | 4 +- input/regression/number-staff-lines.ly | 4 +- input/regression/spacing-clef-first-note.ly | 4 +- input/regression/spacing-folded-clef2.ly | 4 +- input/regression/span-bar.ly | 4 +- input/regression/stem-spacing.ly | 4 +- input/regression/system-extents.ly | 4 +- input/screech-boink.ly | 4 +- input/template/jazz-combo.ly | 4 +- input/template/piano-dynamics.ly | 6 +- input/template/piano-lyrics.ly | 8 +- input/template/piano-melody-lyrics.ly | 2 +- input/template/satb.ly | 4 +- input/test/ambitus-mixed.ly | 4 +- input/test/bagpipe.ly | 4 +- input/test/bar-lines-lyric-only.ly | 10 +- input/test/blank-paper-tab.ly | 4 +- input/test/chord-names-german.ly | 4 +- input/test/chord-names-jazz.ly | 4 +- input/test/chords-without-melody.ly | 4 +- input/test/coriolan-margin.ly | 4 +- input/test/engraver-one-by-one.ly | 48 ++-- input/test/extra-staff.ly | 4 +- input/test/fill-a4.ly | 4 +- input/test/hymn.ly | 4 +- input/test/improv.ly | 4 +- input/test/instrument-name-grandstaff.ly | 4 +- input/test/ligature-vaticana.ly | 4 +- input/test/lyric-hyphen-retain.ly | 4 +- input/test/markup-score.ly | 8 +- input/test/mensural-ligatures.ly | 8 +- input/test/music-box.ly | 6 +- input/test/no-bar-lines.ly | 4 +- input/test/no-staff.ly | 4 +- input/test/ossia.ly | 4 +- input/test/polymetric.ly | 6 +- input/test/rhythm-excercise.ly | 4 +- input/test/slur-ugly.ly | 6 +- input/test/staff-container.ly | 6 +- input/test/staff-space.ly | 4 +- input/test/temporary-stave.ly | 6 +- input/wilhelmus.ly | 4 +- ly/declarations-init.ly | 6 +- ly/engraver-init.ly | 36 +-- ly/part-paper-init.ly | 6 +- ly/performer-init.ly | 8 +- scripts/convert-ly.py | 3 +- 78 files changed, 352 insertions(+), 351 deletions(-) diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 9d82431678..8a7d0cc61d 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -864,7 +864,7 @@ which is sometimes when reusing existing context definitions. } @verbatim \context { - \StaffContext + \Staff \accepts ImproVoice } @end verbatim @@ -878,7 +878,7 @@ Putting both into a @code{\paper} block, like @dots{} @} \context @{ - \StaffContext + \Staff \accepts "ImproVoice" @} @} @@ -1752,7 +1752,7 @@ override this, use a @code{\context} block as follows: @example \paper @{ \context @{ - \PianoStaffContext + \PianoStaff \override VerticalAlignment #'forced-distance = #9 @} @dots{} @@ -1854,7 +1854,7 @@ from the @code{\paper} block, since the @internalsref{SpacingSpanner} is created before any property commands are interpreted. @example \paper @{ \context @{ - \ScoreContext + \Score \override SpacingSpanner #'spacing-increment = #3.0 @} @} @end example diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index a43c586ae7..6e3fcd8cba 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -354,7 +354,7 @@ note heads, the @code{Note_heads_engraver}. \topVoice \paper { \context { - \VoiceContext + \Voice \remove "Stem_engraver" \remove "Phrasing_slur_engraver" \remove "Slur_engraver" @@ -363,7 +363,7 @@ note heads, the @code{Note_heads_engraver}. \remove "Auto_beam_engraver" } \context { - \StaffContext + \Staff \remove "Accidental_engraver" \remove "Key_engraver" \remove "Clef_engraver" @@ -386,7 +386,7 @@ Then a @code{Staff_symbol_engraver} adds the staff \topVoice \paper { \context { - \VoiceContext + \Voice \remove "Stem_engraver" \remove "Phrasing_slur_engraver" \remove "Slur_engraver" @@ -395,7 +395,7 @@ Then a @code{Staff_symbol_engraver} adds the staff \remove "Auto_beam_engraver" } \context { - \StaffContext + \Staff \remove "Accidental_engraver" \remove "Key_engraver" \remove "Clef_engraver" @@ -417,7 +417,7 @@ the @code{Clef_engraver} defines a reference point for the staff \topVoice \paper { \context { - \VoiceContext + \Voice \remove "Stem_engraver" \remove "Phrasing_slur_engraver" \remove "Slur_engraver" @@ -426,7 +426,7 @@ the @code{Clef_engraver} defines a reference point for the staff \remove "Auto_beam_engraver" } \context { - \StaffContext + \Staff \remove "Accidental_engraver" \remove "Key_engraver" \remove "Bar_engraver" @@ -446,7 +446,7 @@ and the @code{Stem_engraver} adds stems. \topVoice \paper { \context { - \VoiceContext + \Voice \remove "Phrasing_slur_engraver" \remove "Slur_engraver" \remove "Script_engraver" @@ -454,7 +454,7 @@ and the @code{Stem_engraver} adds stems. \remove "Auto_beam_engraver" } \context { - \StaffContext + \Staff \remove "Accidental_engraver" \remove "Key_engraver" \remove "Bar_engraver" diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index a743366815..dc7185a648 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -1084,7 +1084,7 @@ of the 20th century } \paper { \context { - \StaffContext + \Staff \consists Custos_engraver } raggedright = ##t diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index a37e99b822..103e9f61f7 100644 --- 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 }}} @@ -3656,7 +3656,7 @@ for example, @example \paper @{ \context @{ - \VoiceContext + \Voice \consists Ambitus_engraver @} @} @@ -3677,7 +3677,7 @@ This results in the following output >> \paper { \context { - \StaffContext + \Staff \consists Ambitus_engraver } } @@ -4596,7 +4596,7 @@ empty after the line-breaking process, they are removed. For normal staves, a specialized @internalsref{Staff} context is available, which does the same: staves containing nothing (or only multi measure rests) are removed. The context definition is stored in -@code{\RemoveEmptyStaffContext} variable. Observe how the second staff +@code{\RemoveEmptyStaff} variable. Observe how the second staff in this example disappears in the second line @@ -4608,7 +4608,7 @@ in this example disappears in the second line >> \paper { linewidth = 6.\cm - \context { \RemoveEmptyStaffContext } + \context { \RemoveEmptyStaff } } } @end lilypond @@ -4893,11 +4893,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 +5260,7 @@ following table indent = 0.0 raggedright = ##t \context { - \StaffContext + \Staff \remove Staff_symbol_engraver \remove Clef_engraver \remove Time_signature_engraver @@ -5332,7 +5332,7 @@ as shown in the following example @example \paper @{ \context @{ - \StaffContext + \Staff \consists Custos_engraver Custos \override #'style = #'mensural @} @@ -5351,7 +5351,7 @@ The result looks like this } \paper { \context { - \StaffContext + \Staff \consists Custos_engraver } } @@ -5504,7 +5504,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 +5545,7 @@ For example, } \paper { \context { - \VoiceContext + \Voice \remove Ligature_bracket_engraver \consists Mensural_ligature_engraver } @@ -5633,11 +5633,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 +5646,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 +5675,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 +5688,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 +5709,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 +5722,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 +5746,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 +5759,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 +5785,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 +5798,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 +5819,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 +5832,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 +5857,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 +5870,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 +5896,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 +5909,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 +5934,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 +5947,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 +5968,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 +5981,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 +6005,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 +6018,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 +6043,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 +6056,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 +6077,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 +6090,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 +6114,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 +6127,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 +6148,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 +6161,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 +6186,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 +6199,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 +6220,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 +6233,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 +6258,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 +6271,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 +6292,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 +6305,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 +6330,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 +6343,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 +6364,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 +6377,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 +6398,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 +6411,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 +6435,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 +6448,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 +6469,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 +6482,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 +6503,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 +6516,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 +6540,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 +6553,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 +6574,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 +6587,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 +6608,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 +6621,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 +6645,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 +6658,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 +6679,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 +6692,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 +6713,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 +6726,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 +6750,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 +6763,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 +6784,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 +6797,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 +6818,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 +6831,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 +6855,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 +6868,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 +6889,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 +6902,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 +6927,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 +6940,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 diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 740d21aa7f..07d264fd2c 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.2" \encoding "latin1" \header { composer = "ARTHUR GRAY" @@ -279,7 +279,7 @@ theScore = \score{ >> \paper { \context { - \ScoreContext + \Score pedalSustainStrings = #'("Ped." "*Ped." "*") \remove Bar_number_engraver } @@ -302,7 +302,7 @@ theScore = \score{ } \context { - \PianoStaffContext + \PianoStaff \accepts Dynamics \override VerticalAlignment #'forced-distance = #7 } diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index fc0087025d..3f27c76b4d 100644 --- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -7,7 +7,7 @@ copyright = "Public Domain" } -\version "2.2.0" +\version "2.3.2" \include "nederlands.ly" @@ -146,7 +146,7 @@ lower = \context Staff \notes \relative c{ \paper { \context{ - \VoiceContext + \Voice } } \midi { diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index 19128cd7e1..5b6416b1ec 100644 --- a/input/mutopia/F.Schubert/morgenlied.ly +++ b/input/mutopia/F.Schubert/morgenlied.ly @@ -27,7 +27,7 @@ been lowered } -\version "2.2.0" +\version "2.3.2" manuscriptBreak = { \break } @@ -166,21 +166,21 @@ pianoLH = \notes \relative c'' \repeat volta 2 { \paper { \context { - \LyricsContext + \Lyrics minimumVerticalExtent = #'(-1.0 . 0) } \context { - \ScoreContext + \Score \override Beam #'thickness = #0.55 \override SpacingSpanner #'spacing-increment = #1.0 \override Slur #'height-limit = #1.5 } \context { - \PianoStaffContext + \PianoStaff \override VerticalAlignment #'forced-distance = #10 } \context { - \StaffContext + \Staff minimumVerticalExtent = #'(-3. . 6) } inputencoding = #"latin1" diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 95084af35d..4b879c1173 100644 --- a/input/mutopia/F.Schubert/standchen.ly +++ b/input/mutopia/F.Schubert/standchen.ly @@ -42,7 +42,7 @@ instrument = "Piano" footer = "Mutopia-2001/04/27-xx" } -\version "2.2.0" +\version "2.3.2" dynamicUp = \override DynamicLineSpanner #'direction = #1 dynamicRevert = \revert DynamicLineSpanner #'direction diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly index 7eb66e92c7..e767214c60 100644 --- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly +++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" % #(ly:set-point-and-click 'line-column) @@ -150,11 +150,11 @@ sarabandeCelloStaff = \context Staff << % size perversions smallerPaper = \paper { - \context { \StaffContext + \context { \Staff fontSize = #-1 \override StaffSymbol #'staff-space = #0.8 } - \context { \ScoreContext + \context { \Score \override SpacingSpanner #'spacing-increment = #0.96 } @@ -167,7 +167,7 @@ baerPaper = \paper { linewidth =183.5 \mm interscoreline=4.0\mm \context { - \ScoreContext + \Score % \override System #'print-function = #box-grob-stencil } } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index 9c4f05e417..d2ce5b0f5f 100644 --- a/input/mutopia/J.S.Bach/bwv940.ly +++ b/input/mutopia/J.S.Bach/bwv940.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.2" %{ Header for Petites Preludes. @@ -152,7 +152,7 @@ global = \notes{ \paper{ linewidth = 17.0 \cm \context { - \ScoreContext + \Score \override SpacingSpanner #'spacing-increment = #2.0 } } diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly index 851276ef41..755094dfa5 100644 --- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -44,7 +44,7 @@ %} -\version "2.2.0" +\version "2.3.2" @@ -216,7 +216,7 @@ bassdux = \context Voice=three \notes \relative c' { \paper { linewidth = 18.0 \cm - \context { \ScoreContext + \context { \Score \override SpacingSpanner #'spacing-increment = #1.0 \override SpacingSpanner #'shortest-duration-space = #1.9 } diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly index 2c0bac808a..e6b133d3d8 100644 --- a/input/mutopia/R.Schumann/romanze-op28-2.ly +++ b/input/mutopia/R.Schumann/romanze-op28-2.ly @@ -4,7 +4,7 @@ \include "deutsch.ly" #(set-global-staff-size 16) -\version "2.2.0" +\version "2.3.2" \header { title = "Romanzen" @@ -282,11 +282,11 @@ leftb = \notes \transpose c cis { \RemoveEmptyStaffContext } \context { - \ScoreContext + \Score \override SpacingSpanner #'common-shortest-duration = #(ly:make-moment 1 8) } \context { - \PianoStaffContext + \PianoStaff \override VerticalAlignment #'forced-distance = #13.0 } } diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly index 74d1fad4e8..154a450ed2 100644 --- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly +++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly @@ -4,7 +4,7 @@ longgrace = \override Stem #'stroke-style = #'() endlonggrace = \revert Stem #'stroke-style ritenuto = \markup { \italic "rit." } -\version "2.2.0" +\version "2.3.2" cresc = \notes { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) @@ -31,7 +31,7 @@ stopGraceMusic= \sequential { \paper{ \context { - \ScoreContext + \Score skipBars = ##t midiInstrument = #"french horn" %% try to mimic Breitkopf @@ -47,7 +47,7 @@ stopGraceMusic= \sequential { \override Slur #'beautiful = #0.3 } \context { - \StaffContext + \Staff minimumVerticalExtent = #'(-4.5 . 4.5) } % #(define fonts my-sheet) diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index b3769b6376..36e35aa318 100644 --- a/input/no-notation/midi-volume-equaliser.ly +++ b/input/no-notation/midi-volume-equaliser.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Midi Volume Equaliser The full orchestra plays a notes, where groups stop one after diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly index 388c95e104..79ec1d3ce4 100644 --- a/input/no-notation/recording.ly +++ b/input/no-notation/recording.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "The @code{Recording_group_engraver} will record events @@ -15,7 +15,7 @@ theMusic = \context Staff \notes { c4 d8-. } listener = \paper { \context { - \VoiceContext + \Voice \type "Recording_group_engraver" recordEventSequence = #notice-the-events } diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index 7a09b2942c..2f993b2cb7 100644 --- a/input/puer-fragment.ly +++ b/input/puer-fragment.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { title = "Puer natus est nobis (excerptum)" subtitle = "Antiphona ad introitum VII" @@ -93,7 +93,7 @@ verba = \context Lyrics = "verba" \lyrics { raggedright = ##t packed = ##t \context { - \ScoreContext + \Score \remove Bar_number_engraver % \override SpacingSpanner #'spacing-increment = #0.5 timing = ##f diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 0c635bc1f4..835df220c1 100644 --- a/input/regression/ambitus.ly +++ b/input/regression/ambitus.ly @@ -24,7 +24,7 @@ paper block: @example \context @{ - \ScoreContext + \Score \override BreakAlignment #'break-align-orders = #(make-vector 3 '( instrument-name left-edge @@ -43,7 +43,7 @@ paper block: @example \context @{ - \VoiceContext + \Voice \consists Ambitus_engraver Ambitus \set #'note-head-style = #'noteheads-2mensural Ambitus \set #'join-heads = ##f @@ -52,7 +52,7 @@ paper block: %} -\version "2.2.0" +\version "2.3.2" upper = \notes \relative c { \clef "treble" @@ -77,7 +77,7 @@ lower = \notes \relative c { >> } \paper { \context { - \ScoreContext + \Score \override BreakAlignment #'break-align-orders = #(make-vector 3 '( instrument-name left-edge @@ -92,7 +92,7 @@ lower = \notes \relative c { )) } \context { - \VoiceContext + \Voice \consists Ambitus_engraver } } diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index e5b4a1451a..2976beb350 100644 --- a/input/regression/arpeggio-collision.ly +++ b/input/regression/arpeggio-collision.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Arpeggio stays clear of accidentals and flipped note heads." @@ -13,7 +13,7 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads." \paper { raggedright = ##t \context{ - \StaffContext + \Staff connectArpeggios = ##t } } diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly index ae32d9e77b..396ab34772 100644 --- a/input/regression/auto-beam.ly +++ b/input/regression/auto-beam.ly @@ -6,7 +6,7 @@ beam." } -\version "2.2.0" +\version "2.3.2" @@ -19,7 +19,7 @@ beam." } \paper { \context { - \StaffContext + \Staff \remove "Clef_engraver" %% \remove "Staff_symbol_engraver" } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index 7e885973af..272d640aa2 100644 --- a/input/regression/bar-number.ly +++ b/input/regression/bar-number.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -23,7 +23,7 @@ be increased. \paper { raggedright = ##t \context { - \ScoreContext + \Score \override BarNumber #'break-visibility = #all-visible } } diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index fc6676614e..3218502659 100644 --- a/input/regression/completion-heads-polyphony.ly +++ b/input/regression/completion-heads-polyphony.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Completion heads are broken across bar lines. This was @@ -16,7 +16,7 @@ Completion heads are not fooled by polyphony with a different rhythm. \paper { \context{ - \VoiceContext + \Voice \remove "Note_heads_engraver" \consists "Completion_heads_engraver" } diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index 55f1724130..c40d0a28d8 100644 --- a/input/regression/completion-heads.ly +++ b/input/regression/completion-heads.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc=" @@ -20,7 +20,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr } \paper{ \context{ - \VoiceContext + \Voice \remove "Note_heads_engraver" \consists "Completion_heads_engraver" } diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 7a05faddde..bb2382d700 100644 --- a/input/regression/custos.ly +++ b/input/regression/custos.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Custodes may be engraved in various styles." } @@ -25,7 +25,7 @@ } \paper { \context { - \StaffContext + \Staff \consists Custos_engraver } raggedright = ##t diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index 3b5bed9c9a..adf346789b 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.2" \header{ @@ -26,7 +26,7 @@ The engraver does no time-keeping, so it involves some trickery to get \paper{ linewidth = 50.\mm indent = 0 \context{ - \StaffContext + \Staff % makes for handier debugging % \remove Clef_engraver } diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly index effb027b19..93c1dcad51 100644 --- a/input/regression/hara-kiri-pianostaff.ly +++ b/input/regression/hara-kiri-pianostaff.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index 9e8cd19279..65dc67de82 100644 --- a/input/regression/lyric-hyphen-break.ly +++ b/input/regression/lyric-hyphen-break.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -25,7 +25,7 @@ r c16[ c c] linewidth = 3.4 \cm \context { - \StaffContext \remove "Time_signature_engraver" + \Staff \remove "Time_signature_engraver" } } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index dac707f6f9..6ca77e3ba7 100644 --- a/input/regression/lyrics-bar.ly +++ b/input/regression/lyrics-bar.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc=" @@ -26,11 +26,11 @@ lyrics do not collide with barlines. \paper { raggedright = ##t \context { - \ScoreContext + \Score \accepts "LyricsWithBars" } \context { - \LyricsContext + \Lyrics \consists "Bar_engraver" \name "LyricsWithBars" } diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly index 920993f431..328a7ff0a4 100644 --- a/input/regression/measure-grouping.ly +++ b/input/regression/measure-grouping.ly @@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped. " } -\version "2.2.0" +\version "2.3.2" %% TODO: should have 2/4 + 5/8 time sig style. @@ -25,7 +25,7 @@ brackets above beats when the beats of a time signature are grouped. " } \paper { raggedright = ##t - \context { \StaffContext + \context { \Staff \consists "Measure_grouping_engraver" } } diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly index a5f42865e3..14ae73ba29 100644 --- a/input/regression/multi-measure-rest-instr-name.ly +++ b/input/regression/multi-measure-rest-instr-name.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "There are both long and short instrument names. @@ -16,7 +16,7 @@ multimeasure rests. " \paper { raggedright = ##t \context { - \StaffContext + \Staff \consists Instrument_name_engraver } diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 3545eb844e..24fecfee73 100644 --- a/input/regression/multi-measure-rest.ly +++ b/input/regression/multi-measure-rest.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc=" @@ -28,7 +28,7 @@ are used then a different symbol is used. } \paper { \context { - \ScoreContext + \Score skipBars = ##t } raggedright = ##t diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly index 5926fb2956..e804e348bc 100644 --- a/input/regression/new-markup-scheme.ly +++ b/input/regression/new-markup-scheme.ly @@ -5,7 +5,7 @@ texts using a similar syntax as @code{\\markup}." } -\version "2.2.0" +\version "2.3.2" \score { \notes { \fatText @@ -57,7 +57,7 @@ raggedright = ##t indent = #0 \context { - \StaffContext + \Staff \remove Time_signature_engraver } } diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index ed80134e5c..aa5a3496e4 100644 --- a/input/regression/note-group-bracket.ly +++ b/input/regression/note-group-bracket.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -30,7 +30,7 @@ analysis brackets start and end. \paper { \context { - \StaffContext \consists "Horizontal_bracket_engraver" + \Staff \consists "Horizontal_bracket_engraver" } raggedright = ##t } diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 73ac03f063..afbc508cf8 100644 --- a/input/regression/number-staff-lines.ly +++ b/input/regression/number-staff-lines.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc=" The number of stafflines of a staff can be set. Ledger @@ -13,7 +13,7 @@ adjusted accordingly. " } \paper { -\context { \StaffContext +\context { \Staff \override StaffSymbol #'line-count = #3 } } \midi { } diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly index 695fdf2954..c283941aa1 100644 --- a/input/regression/spacing-clef-first-note.ly +++ b/input/regression/spacing-clef-first-note.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Clef changes at the start of a line get much more space @@ -17,7 +17,7 @@ than clef changes halfway the line." }>> } \paper { raggedright = ##t -\context { \StaffContext +\context { \Staff TimeSignature = \turnOff } diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly index 5e8c4ca002..6cb5203c3c 100644 --- a/input/regression/spacing-folded-clef2.ly +++ b/input/regression/spacing-folded-clef2.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "A clef can be folded below notes in a different staff, if @@ -13,7 +13,7 @@ show where columns are in the score." \paper { raggedright = ##t - \context { \ScoreContext + \context { \Score \override NonMusicalPaperColumn #'print-function = #Paper_column::print \override PaperColumn #'print-function = #Paper_column::print \override NonMusicalPaperColumn #'font-family = #'roman diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly index 7fd2cf3f1e..04f86b2ad2 100644 --- a/input/regression/span-bar.ly +++ b/input/regression/span-bar.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Span bars are drawn only between staff bar lines. By setting bar lines to transparent, they are shown only between systems. @@ -28,7 +28,7 @@ between systems. >> \paper { \context { - \StaffContext + \Staff } raggedright =##t } diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 3a8d088297..54e5c6187e 100644 --- a/input/regression/stem-spacing.ly +++ b/input/regression/stem-spacing.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc=" @@ -28,7 +28,7 @@ In this example, space for opposite pointed stems is adjusted. } \paper { raggedright = ##t - \context { \ScoreContext + \context { \Score \override SpacingSpanner #'stem-spacing-correction = #0.0 } } } diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 315f942cba..61b60ec272 100644 --- a/input/regression/system-extents.ly +++ b/input/regression/system-extents.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "The size of every system is correctly determined; this @@ -15,7 +15,7 @@ \paper { \context { - \ScoreContext + \Score \override System #'print-function = #box-grob-stencil } } diff --git a/input/screech-boink.ly b/input/screech-boink.ly index 3e7d3330a2..1008d7575c 100644 --- a/input/screech-boink.ly +++ b/input/screech-boink.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.2" \header { title = "Screech and boink" subtitle = "Random complex notation" @@ -57,7 +57,7 @@ raggedright = ##t \context { - \StaffContext + \Staff \consists Horizontal_bracket_engraver } diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly index 7d0d9eb6c7..b55aca6468 100644 --- a/input/template/jazz-combo.ly +++ b/input/template/jazz-combo.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { title = "Song" subtitle = "(tune)" @@ -241,7 +241,7 @@ drumContents = { linewidth = 15.0 \cm \context { \RemoveEmptyStaffContext } \context { - \ScoreContext + \Score \override BarNumber #'padding = #3 \override RehearsalMark #'padding = #2 skipBars = ##t diff --git a/input/template/piano-dynamics.ly b/input/template/piano-dynamics.ly index 0be436ca76..d2aad42957 100644 --- a/input/template/piano-dynamics.ly +++ b/input/template/piano-dynamics.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc =" Dynamics on a separate line, neatly centered between staffs. @@ -58,7 +58,7 @@ pedal = \notes { \consistsend "Axis_group_engraver" } \context { - \PianoStaffContext + \PianoStaff \accepts Dynamics \override VerticalAlignment #'forced-distance = #7 } @@ -72,7 +72,7 @@ pedal = \notes { \consists "Dynamic_performer" } \context { - \PianoStaffContext + \PianoStaff \accepts Dynamics } } diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 2ad3bd5204..9d33b25421 100644 --- a/input/template/piano-lyrics.ly +++ b/input/template/piano-lyrics.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc ="Lyrics between two staffs." @@ -29,12 +29,12 @@ text = \lyrics { >> \paper { \context { - \GrandStaffContext + \GrandStaff \accepts "Lyrics" } \context { - %\LyricsContext - \LyricsContext + %\Lyrics + \Lyrics \consists "Bar_engraver" } } diff --git a/input/template/piano-melody-lyrics.ly b/input/template/piano-melody-lyrics.ly index 34b19adb16..ff6f683f22 100644 --- a/input/template/piano-melody-lyrics.ly +++ b/input/template/piano-melody-lyrics.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc ="Classical song format: one staff with melody and lyrics, and piano accompaniment." diff --git a/input/template/satb.ly b/input/template/satb.ly index 2ba826216f..61684f4dae 100644 --- a/input/template/satb.ly +++ b/input/template/satb.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = " @@ -45,7 +45,7 @@ bassWords = \lyrics { ho4 ho ho ho } \context { % a little smaller so lyrics can be closer to the staff. - \StaffContext + \Staff minimumVerticalExtent = #'(-3 . 3) } } diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly index 5b1533c5d5..79f2576aaa 100644 --- a/input/test/ambitus-mixed.ly +++ b/input/test/ambitus-mixed.ly @@ -13,7 +13,7 @@ in the same score (not demonstrated in this file). " } -\version "2.3.1" +\version "2.3.2" #(define (kill-ambitus grob grob-context apply-context) (if (memq 'ambitus-interface (ly:grob-property grob 'interfaces)) @@ -53,7 +53,7 @@ voiceB = \notes \relative c' { raggedright = ##t \context { - \VoiceContext + \Voice \consists Ambitus_engraver } } diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly index 30d7ebba37..059e479031 100644 --- a/input/test/bagpipe.ly +++ b/input/test/bagpipe.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Bagpipe Music @@ -10,7 +10,7 @@ Here's an example of bagpipe music. linewidth = 14.0 \cm indent = 0.0 \cm \context { - \StaffContext + \Staff \override TimeSignature #'style = #'C \override TimeSignature #'break-visibility = #begin-of-line-visible } diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly index 2a929a1eae..56bf0c7f68 100644 --- a/input/test/bar-lines-lyric-only.ly +++ b/input/test/bar-lines-lyric-only.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Bar line lyric only You can move @code{Bar_engraver} and @code{Span_bar_engraver} to a different engraving context, if you want, for example, bar lines @@ -20,21 +20,21 @@ on lyrics. " \paper { raggedright = ##t \context { - \LyricsContext + \Lyrics \consists Bar_engraver % need procedure, since lyrics doesn't have a staff_sym engraver. \override BarLine #'bar-size-procedure = #(lambda (x) 3.0) } \context { - \LyricsContext + \Lyrics \consists "Span_bar_engraver" } \context{ - \ChoirStaffContext + \ChoirStaff \remove "Span_bar_engraver" } \context { - \StaffContext + \Staff \remove "Bar_engraver" } }} diff --git a/input/test/blank-paper-tab.ly b/input/test/blank-paper-tab.ly index 85c1d018a7..4fdc65471b 100644 --- a/input/test/blank-paper-tab.ly +++ b/input/test/blank-paper-tab.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Blank Paper Tab @@ -17,7 +17,7 @@ emptymusic = \notes { \repeat unfold 4 { s1\break } \bar "|." } \paper { \context { - \ScoreContext + \Score \remove Bar_number_engraver } } diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly index 82f7dc878f..50cb424a31 100644 --- a/input/test/chord-names-german.ly +++ b/input/test/chord-names-german.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Chord Names German The english naming of chords (default) can be changed to german @@ -27,6 +27,6 @@ scm = \chords { \context Voice { \scm } >> \paper { raggedright = ##t - \context {\ChordNamesContext \consists Instrument_name_engraver }} + \context {\ChordNames \consists Instrument_name_engraver }} } diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 985b675aa9..d225edf569 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -146,7 +146,7 @@ banterProperties = \sequential { \paper { indent = 3.\cm \context { - \ChordNamesContext + \ChordNames \consists Instrument_name_engraver } } diff --git a/input/test/chords-without-melody.ly b/input/test/chords-without-melody.ly index 79ab3b6a2b..36be7ea5ba 100644 --- a/input/test/chords-without-melody.ly +++ b/input/test/chords-without-melody.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "Jazz chord names can also be printed without notes." } @@ -13,7 +13,7 @@ texidoc = "Jazz chord names can also be printed without notes." } \paper{ \context{ - \ChordNamesContext + \ChordNames \override BarLine #'bar-size = #4 diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index b68797aae1..7dd1919387 100644 --- a/input/test/coriolan-margin.ly +++ b/input/test/coriolan-margin.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" % Ugh, we need to override some LaTeX titling stuff @@ -138,7 +138,7 @@ violoncello = \notes \relative c' { \RemoveEmptyStaffContext } \context { - \OrchestralScoreContext + \OrchestralScore \override TimeSignature #'style = #'C } } diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index d04633cabd..ea2d9f08c3 100644 --- a/input/test/engraver-one-by-one.ly +++ b/input/test/engraver-one-by-one.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "The notation problem, creating a certain symbol, @@ -129,27 +129,27 @@ MyVoiceContext = \context { \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyStaffContext = \context { - \MyStaffContext + \MyStaff \consists "Staff_symbol_engraver" } \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyStaffContext = \context { - \MyStaffContext + \MyStaff \consists "Clef_engraver" \remove "Pitch_squash_engraver" } @@ -157,39 +157,39 @@ MyStaffContext = \context { \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyVoiceContext = \context { - \MyVoiceContext + \MyVoice \consists "Stem_engraver" } \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyVoiceContext = \context { - \MyVoiceContext + \MyVoice \consists "Beam_engraver" } \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyVoiceContext= \context { - \MyVoiceContext + \MyVoice \consists "Phrasing_slur_engraver" \consists "Slur_engraver" \consists "Script_engraver" @@ -199,13 +199,13 @@ MyVoiceContext= \context { \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyStaffContext = \context { - \MyStaffContext + \MyStaff \consists "Bar_engraver" \consists "Time_signature_engraver" @@ -214,20 +214,20 @@ MyStaffContext = \context { \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } MyStaffContext = \context - { \MyStaffContext + { \MyStaff \consists "Accidental_engraver" \consists "Key_engraver" } \score { \topVoice \paper { - \context { \MyStaffContext } - \context { \MyVoiceContext } + \context { \MyStaff } + \context { \MyVoice } } } diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index fd2d0e827d..964db8fef5 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" % definitely wil be renamed to something. %{ @@ -46,7 +46,7 @@ a piece. " \paper { raggedright = ##t \context{ - \ScoreContext + \Score } } diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly index 270483c12d..70e72fbbc7 100644 --- a/input/test/fill-a4.ly +++ b/input/test/fill-a4.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" %possible rename to paper-fill-a4.ly -gp % candidate for reg -gp % Han says no, but keeping this comment temporarily so that I don't @@ -37,7 +37,7 @@ This should fill a4 paper. " papersize = "a4" linewidth = 15.0\mm \context { - \StaffContext + \Staff minimumVerticalExtent = #(cons 0 0) } } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index 4ac03a40ef..67c3ea2269 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = " @@ -27,7 +27,7 @@ texts, so they should be switched off. \paper{ linewidth=140.\mm \context { - \VoiceContext + \Voice soloADue = ##f } } diff --git a/input/test/improv.ly b/input/test/improv.ly index 1f3e201f1c..c34c822b7d 100644 --- a/input/test/improv.ly +++ b/input/test/improv.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = @@ -42,7 +42,7 @@ global = \notes { s1*3 \bar "|." } >> \paper { \context { - \VoiceContext + \Voice \consists Pitch_squash_engraver } raggedright = ##t diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index 0d4ac78559..1f2ecbbc6d 100644 --- a/input/test/instrument-name-grandstaff.ly +++ b/input/test/instrument-name-grandstaff.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Instrument Name Grandstaff You can have a name for the whole @code{GrandStaff} in addition to individual @code{Staff}s. " } @@ -14,6 +14,6 @@ individual @code{Staff}s. " } \paper { raggedright = ##t -\context { \GrandStaffContext \consists "Instrument_name_engraver" } +\context { \GrandStaff \consists "Instrument_name_engraver" } }} diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly index 304f18fc53..b24522c67b 100644 --- a/input/test/ligature-vaticana.ly +++ b/input/test/ligature-vaticana.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Ancient Vaticana Vaticana ligature uses four staff lines, special clef, an notes @@ -34,7 +34,7 @@ verba = \context Lyrics = "verba" \lyrics { raggedright = ##t packed = ##t \context { - \ScoreContext + \Score \remove Bar_number_engraver timing = ##f barAlways = ##t diff --git a/input/test/lyric-hyphen-retain.ly b/input/test/lyric-hyphen-retain.ly index f2484e4fd9..e6eab5480e 100644 --- a/input/test/lyric-hyphen-retain.ly +++ b/input/test/lyric-hyphen-retain.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -43,7 +43,7 @@ c16[ c c c] linewidth = 3.4 \cm \context { - \StaffContext \remove "Time_signature_engraver" + \Staff \remove "Time_signature_engraver" } } diff --git a/input/test/markup-score.ly b/input/test/markup-score.ly index 7ab00df56b..12de723acf 100644 --- a/input/test/markup-score.ly +++ b/input/test/markup-score.ly @@ -10,7 +10,7 @@ } -\version "2.3.1" +\version "2.3.2" %%;; Hmm - why is stencil so tall? #(define (page-stack-lines page) @@ -43,14 +43,14 @@ inBed = \paper { %% (box-stencil (page-stack-lines page) 0.1 0.5)) \context { - \StaffContext + \Staff minimumVerticalExtent = ##f } } noCruft = \paper { \context { - \StaffContext + \Staff %% Hmm, no effect ? %% \override StaffSymbol #'print-function = ##f %% Clef = \turnOff @@ -68,7 +68,7 @@ noCruftInBed = \paper { %%\noCruft %%URGHSr \context { - \StaffContext + \Staff %% Hmm, no effect ? %% \override StaffSymbol #'print-function = ##f %% Clef = \turnOff diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index f357889b41..51d77865c5 100644 --- a/input/test/mensural-ligatures.ly +++ b/input/test/mensural-ligatures.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" % TODO: % check with ancient- stuff. rename, merge, something. -gp @@ -48,7 +48,7 @@ voice = \notes \transpose c c' { \paper { linethickness = \staffspace / 5.0 \context { - \VoiceContext + \Voice \name MensuralVoice \alias Voice \remove Ligature_bracket_engraver @@ -56,7 +56,7 @@ voice = \notes \transpose c c' { \override NoteHead #'style = #'mensural } \context { - \StaffContext + \Staff \name MensuralStaff \alias Staff \accepts MensuralVoice @@ -76,7 +76,7 @@ voice = \notes \transpose c c' { \accepts MensuralVoice } \context { - \ScoreContext + \Score \accepts MensuralStaff } } diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 91182ee3c5..7b3a2583fc 100644 --- a/input/test/music-box.ly +++ b/input/test/music-box.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.2" \include "deutsch.ly" % possible rename to scheme- something. -gp % TODO: ask if it needs to have so many empty bars in the middle. -gp @@ -62,7 +62,7 @@ using Scheme functions to avoid typing work. " } -\version "2.3.1" +\version "2.3.2" pat = \notes \transpose c c' \repeat unfold 2 { << { \context Staff=up {r8 e16 f g e f g } } @@ -131,7 +131,7 @@ endc = \notes {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } >> \paper { \context { - \PianoStaffContext + \PianoStaff \override VerticalAlignment #'forced-distance = #10 } diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index 740608b056..63519187a7 100644 --- a/input/test/no-bar-lines.ly +++ b/input/test/no-bar-lines.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" % possible rename to bar-lines-foo. -gp \header{ texidoc = "@cindex Bar Lines Remove @@ -16,7 +16,7 @@ have been removed. \paper { raggedright = ##t \context { - \StaffContext + \Staff whichBar = #"" \remove "Time_signature_engraver" } diff --git a/input/test/no-staff.ly b/input/test/no-staff.ly index 07ece62c69..5f8b33e1d9 100644 --- a/input/test/no-staff.ly +++ b/input/test/no-staff.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" % possible rename to staff-something. -gp \header{ texidoc = "@cindex Staff Remove @@ -12,7 +12,7 @@ corresponding engraver. \paper { raggedright = ##t \context { - \StaffContext + \Staff \remove Staff_symbol_engraver \consists Pitch_squash_engraver \remove Clef_engraver diff --git a/input/test/ossia.ly b/input/test/ossia.ly index bf91f9e639..7d559488f1 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -4,7 +4,7 @@ @code{RemoveEmptyStaffContext} take out the unused parts. " } -\version "2.2.0" +\version "2.3.2" \score { \notes\relative c'' @@ -34,7 +34,7 @@ raggedright= ##t \context {\RemoveEmptyStaffContext} \context { - \ScoreContext + \Score \remove System_start_delimiter_engraver } } diff --git a/input/test/polymetric.ly b/input/test/polymetric.ly index 788ec27a09..246099767e 100644 --- a/input/test/polymetric.ly +++ b/input/test/polymetric.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc="@cindex Time Signature Multiple @@ -36,11 +36,11 @@ lines seem to distort the regular spacing. \paper{ raggedright = ##t \context{ - \ScoreContext + \Score \remove "Timing_engraver" } \context{ - \StaffContext + \Staff \consists "Timing_engraver" } diff --git a/input/test/rhythm-excercise.ly b/input/test/rhythm-excercise.ly index 3f330866e8..14e39408d3 100644 --- a/input/test/rhythm-excercise.ly +++ b/input/test/rhythm-excercise.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc = "@cindex Rhythm Exercise Rythmic exercises may be produced by removing the @code{Clef} engraver, putting all notes to the same pitch and using transparent staff lines. @@ -8,7 +8,7 @@ putting all notes to the same pitch and using transparent staff lines. \score { \notes { c4 c4 c8[ c8] c2 c2 } \paper { - \context { \StaffContext + \context { \Staff \override StaffSymbol #'transparent = ##t \consists Pitch_squash_engraver \remove Clef_engraver diff --git a/input/test/slur-ugly.ly b/input/test/slur-ugly.ly index e1683c6303..e21c8a862d 100644 --- a/input/test/slur-ugly.ly +++ b/input/test/slur-ugly.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { texidoc="@cindex Slur Ugly Strange slurs can be produced by setting properties by hand. " @@ -22,13 +22,13 @@ baseWalk = \notes \relative c { \paper { raggedright = ##t \context { - \VoiceContext + \Voice \override Slur #'beautiful = #5.0 \override Slur #'direction = #1 \override Stem #'direction = #-1 } \context { - \PianoStaffContext + \PianoStaff \override VerticalAlignment #'threshold = #'(5 . 5) } } diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 2145133921..27910a90d9 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -38,7 +38,7 @@ what you would expect.) \paper { \context { - \ScoreContext + \Score \accepts StaffContainer \denies Staff } @@ -53,7 +53,7 @@ what you would expect.) \name StaffContainer } \context { - \StaffContext + \Staff \remove Axis_group_engraver \remove Separating_line_group_engraver \remove Clef_engraver diff --git a/input/test/staff-space.ly b/input/test/staff-space.ly index b0a60e31d2..e2bd4672ea 100644 --- a/input/test/staff-space.ly +++ b/input/test/staff-space.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \header{ texidoc ="@cindex Staff Space By just increasing @code{staff-space} on a staff, you may produce strange @@ -17,7 +17,7 @@ results. " } >> \paper { \context { - \StaffContext + \Staff \override StaffSymbol #'staff-space = #5.5 } raggedright=##t } diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly index dfa128dff6..8c3807ad04 100644 --- a/input/test/temporary-stave.ly +++ b/input/test/temporary-stave.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.2" \header { @@ -24,7 +24,7 @@ time and key signatures and clef at the beginning of the extra stave. } \paper { \context { - \ScoreContext + \Score \consists Span_bar_engraver % Avoid a vertical line at the beginning of the system: \remove System_start_delimiter_engraver @@ -32,7 +32,7 @@ time and key signatures and clef at the beginning of the extra stave. \accepts "TemporaryStaff" } \context { - \StaffContext + \Staff \name "TemporaryStaff" \alias "Staff" \remove "Clef_engraver" diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index 13da16aaad..cb43459464 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -1,4 +1,4 @@ -\version "2.3.1" +\version "2.3.2" \header { texidoc = "Wilhelmus van Nassouwe" @@ -146,7 +146,7 @@ oneHalfNoteTime = \markup { raggedright = ##t \context { - \ScoreContext + \Score %% defaults %% (shortest-duration-space . 2.0) %% (spacing-increment . 1.2) diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 6561b0da04..b710b6f82c 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "2.2.0" +\version "2.3.2" breve = #(ly:make-duration -1 0) longa = #(ly:make-duration -2 0 ) maxima = #(ly:make-duration -3 0) @@ -140,13 +140,13 @@ paperTwentysix = \paper { partCombineListener = \paper { \context { - \VoiceContext + \Voice \consists Note_heads_engraver \consists Rest_engraver \type "Recording_group_engraver" recordEventSequence = #notice-the-events-for-pc } - \context { \ScoreContext skipTypesetting = ##t } + \context { \Score skipTypesetting = ##t } } #(set-part-combine-listener partCombineListener) diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index fb85ddf42b..a64089ab49 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" \context { \name Global @@ -62,7 +62,7 @@ } \context { - \StaffContext + \Staff \type "Engraver_group_engraver" \name DrumStaff \alias Staff @@ -100,7 +100,7 @@ } \context { - \InnerChoirStaffContext + \InnerChoirStaff \name ChoirStaff \accepts "InnerChoirStaff" @@ -212,7 +212,7 @@ } \context { - \VoiceContext + \Voice \name DrumVoice \alias Voice @@ -256,7 +256,7 @@ } \context{ - \GrandStaffContext + \GrandStaff \name "PianoStaff" \alias "GrandStaff" @@ -296,7 +296,7 @@ } \context { - \InnerStaffGroupContext + \InnerStaffGroup \name StaffGroup \description @@ -371,7 +371,7 @@ printing of a single line of lyrics. " RemoveEmptyStaffContext= \context { - \StaffContext + \Staff \remove "Axis_group_engraver" \consistsend "Hara_kiri_engraver" \override Beam #'auto-knee-gap = #'() @@ -560,11 +560,11 @@ AncientRemoveEmptyStaffContext = \context { } OrchestralScoreContext = \context { - \ScoreContext + \Score } -EasyNotation = \context { - \ScoreContext +EasyNotation = \context { % TODO: why \context override? + \Score \override NoteHead #'print-function = #Note_head::brew_ez_stencil \override NoteHead #'Y-extent-callback = #'() \override NoteHead #'X-extent-callback = #'() @@ -596,7 +596,7 @@ EasyNotation = \context { } \context { - \VoiceContext + \Voice \name "TabVoice" \consists "Tab_note_heads_engraver" \remove "Note_heads_engraver" @@ -618,7 +618,7 @@ EasyNotation = \context { } \context { - \StaffContext + \Staff \alias "Staff" \name "TabStaff" \denies "Voice" @@ -648,14 +648,14 @@ EasyNotation = \context { % but this does not work (is this a bug or intended behaviour?): % % If I try to do so, I get "error: unknown escaped string: -% `\VaticanaStaffContext'" in params-init.ly. If I also move +% `\VaticanaStaff'" in params-init.ly. If I also move % "\context { \Vaticana*Context }" from params-init.ly to the end % of gregorian-init.ly, then I get "error: parse error, unexpected -% TRANSLATOR: \context { \VaticanaStaffContext }" in +% TRANSLATOR: \context { \VaticanaStaff }" in % gregorian-init.ly. --jr \context { - \VoiceContext + \Voice \name "VaticanaVoice" \alias "Voice" \description "Same as @code{Voice} context, except that it is accommodated for tyepsetting Gregorian Chant in the notational style of Editio Vaticana." @@ -684,7 +684,7 @@ EasyNotation = \context { } \context { - \StaffContext + \Staff \name "VaticanaStaff" \alias "Staff" \denies "Voice" @@ -723,7 +723,7 @@ EasyNotation = \context { } \context { - \VoiceContext + \Voice \name "GregorianTranscriptionVoice" \alias "Voice" @@ -748,7 +748,7 @@ EasyNotation = \context { \override TextSpanner #'edge-text = #'("" . "") } \context { - \StaffContext + \Staff \name "GregorianTranscriptionStaff" \alias "Staff" \denies "Voice" diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly index 1f66c5e274..13aa8fddac 100644 --- a/ly/part-paper-init.ly +++ b/ly/part-paper-init.ly @@ -1,10 +1,10 @@ -\version "2.2.0" +\version "2.3.2" % JUNKME %part-paper-init.ly \paper { - \context { \OrchestralPartStaffContext } - \context { \ScoreContext skipBars = ##t } + \context { \OrchestralPartStaff } + \context { \Score skipBars = ##t } } diff --git a/ly/performer-init.ly b/ly/performer-init.ly index bad1bd4155..9f0d421bd3 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.2" % % setup for Request->Element conversion. Guru-only @@ -18,7 +18,7 @@ \description "Hard coded entry point for LilyPond. Cannot be tuned." } \context { - \StaffContext + \Staff \name DrumStaff midiInstrument = #"drums" \accepts DrumVoice @@ -39,7 +39,7 @@ \context { - \VoiceContext + \Voice \remove "Note_performer" \consists "Drum_note_performer" \name DrumVoice @@ -148,6 +148,6 @@ \accepts DrumStaff } -\context { \StaffContext \name RhythmicStaff } +\context { \Staff \name RhythmicStaff } diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index cabc4a0ba0..22ffd43048 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2091,7 +2091,8 @@ conversions.append (((2, 3, 1), conv, def conv (str): def func(m): if m.group(1) not in ['RemoveEmptyStaff', - ]: + 'AncientRemoveEmptyStaffContext', + 'EasyNotation']: return '\\' + m.group (1) else: return m.group (0) -- 2.39.5