From: Trevor Daniels Date: Tue, 19 Oct 2010 22:15:39 +0000 (+0100) Subject: Doc: NR 2.1 Vocal: remove use of InstrumentSwitch in cues X-Git-Tag: release/2.13.37-1~56 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c1aa3b16f7b94ca32b0c022f60ed66826d031b0;p=lilypond.git Doc: NR 2.1 Vocal: remove use of InstrumentSwitch in cues - use simple markup instead - all these changes are courtesy of Keith E OHara --- diff --git a/Documentation/notation/vocal.itely b/Documentation/notation/vocal.itely index adc9bf7d33..3b0aa9b84a 100644 --- a/Documentation/notation/vocal.itely +++ b/Documentation/notation/vocal.itely @@ -2462,9 +2462,8 @@ main text, see @ref{Quoting other voices} and @ref{Formatting cue notes}. But when many cues have to be inserted, for example, as an aid to a conductor in a vocal score, the instrument name must be positioned carefully just before and -close to the start of the cued notes. The following example shows -how this is done. Note that the name of the grob for overriding -the cued instrument name is @code{InstrumentSwitch}. +close to the start of the cue notes. The following example shows +how this is done. @lilypond[quote,verbatim] flute = \relative c'' { @@ -2474,12 +2473,9 @@ flute = \relative c'' { pianoRH = \relative c'' { c4. g8 - % position name of cued instrument just before the cued notes - \once \override CueVoice.InstrumentSwitch - #'self-alignment-X = #RIGHT - % position name of cued instrument above the staff - \once \override CueVoice.InstrumentSwitch #'direction = #UP - \set CueVoice.instrumentCueName = "Flute" + % position name of cue-ing instrument just before the cue notes, + % and above the staff + s1*0^\markup { \right-align { \tiny "Flute" } } \cueDuring "flute" #UP { g4 bes4 } } pianoLH = \relative c { c4 e, } @@ -2497,14 +2493,14 @@ pianoLH = \relative c { c4 e, } } @end lilypond -If a transposing instrument is being cued the instrument part should -specify its key so the conversion of its cued notes will be done +If a transposing instrument is being quoted the instrument part should +specify its key so the conversion of its cue notes will be done automatically. The example below shows this transposition for a B-flat clarinet. The notes in this example are low on the staff so @code{#DOWN} is specified in @code{\cueDuring} (so the stems are down) and the instrument name is positioned below the staff. Note also that the piano right-hand voice is explicitly declared. This -is because the cued notes in this example begin at the start of the +is because the cue notes in this example begin at the start of the first bar and this would otherwise cause the entire piano right-hand notes to be placed in a @code{CueVoice} context. @@ -2517,12 +2513,8 @@ clarinet = \relative c' { pianoRH = \relative c'' { \transposition c' - % position name of cued instrument just before the cued notes - \once \override CueVoice.InstrumentSwitch - #'self-alignment-X = #RIGHT - % position name of cued instrument below the staff - \once \override CueVoice.InstrumentSwitch #'direction = #DOWN - \set CueVoice.instrumentCueName = "Clar." + % position name of cue-ing instrument below the staff + s1*0_\markup { \right-align { \tiny "Clar." } } \cueDuring "clarinet" #DOWN { c4. g8 } g4 bes4 } @@ -2546,10 +2538,10 @@ pianoLH = \relative c { c4 e, } @end lilypond From these two examples it is clear that inserting many cues in a -Vocal Score would be extremely tedious, and the notes of the piano -part would be obscured by the many overrides. However, as the -following snippet shows, it is possible to define a music function -to reduce the amount of typing and to make the piano notes clearer. +Vocal Score would be tedious, and the notes of the piano part would +become obscured. However, as the following snippet shows, it is +possible to define a music function to reduce the amount of typing +and to make the piano notes clearer. @snippets @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle] @@ -2576,10 +2568,10 @@ Internals Reference: @knownissues @code{\cueDuring} automatically inserts a @code{CueVoice} context and all cue notes are placed in that context. This means it is not -possible to have two overlapping sequences of cued notes by this +possible to have two overlapping sequences of cue notes by this technique. Overlapping sequences could be entered by explicitly declaring separate @code{CueVoice} contexts and using -@code{\quoteDuring} to extract and insert the cued notes. +@code{\quoteDuring} to extract and insert the cue notes. @node Spoken music diff --git a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly index 3b27a2c8d6..5d8afa643f 100644 --- a/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly +++ b/Documentation/snippets/adding-orchestral-cues-to-a-vocal-score.ly @@ -38,7 +38,7 @@ inserted before the cue notes, then either @code{#UP} or @code{#DOWN} to specify either @code{\\voiceOne} with the name above the staff or @code{\\voiceTwo} with the name below the staff, and finally the piano music in parallel with which the cue notes are to appear. The name -of the cued instrument is positioned to the left of the cued notes. +of the quoted instrument is positioned to the left of the cue notes. Many passages can be cued, but they cannot overlap each other in time. " doctitle = "Adding orchestral cues to a vocal score" @@ -51,10 +51,10 @@ cueWhile = (string? string? ly:dir? ly:music?) #{ \cueDuring $instrument #$dir { - \once \override CueVoice.InstrumentSwitch #'self-alignment-X = #RIGHT - \once \override CueVoice.InstrumentSwitch #'direction = $dir - \set CueVoice.instrumentCueName = $name - { $music } + \once \override TextScript #'self-alignment-X = #RIGHT + \once \override TextScript #'direction = $dir + s1*0-\markup { \tiny $name } + $music } #} ) diff --git a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly b/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly index 4efd5cf9cf..4465d6ed9d 100644 --- a/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly +++ b/Documentation/snippets/new/adding-orchestral-cues-to-a-vocal-score.ly @@ -11,7 +11,7 @@ inserted before the cue notes, then either @code{#UP} or @code{#DOWN} to specify either @code{\voiceOne} with the name above the staff or @code{\voiceTwo} with the name below the staff, and finally the piano music in parallel with which the cue notes are to appear. The name -of the cued instrument is positioned to the left of the cued notes. +of the quoted instrument is positioned to the left of the cue notes. Many passages can be cued, but they cannot overlap each other in time. " doctitle = "Adding orchestral cues to a vocal score" @@ -23,10 +23,10 @@ cueWhile = (string? string? ly:dir? ly:music?) #{ \cueDuring $instrument #$dir { - \once \override CueVoice.InstrumentSwitch #'self-alignment-X = #RIGHT - \once \override CueVoice.InstrumentSwitch #'direction = $dir - \set CueVoice.instrumentCueName = $name - { $music } + \once \override TextScript #'self-alignment-X = #RIGHT + \once \override TextScript #'direction = $dir + s1*0-\markup { \tiny $name } + $music } #} )