X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fnotation%2Fstaff.itely;h=8d37fe33fa1c8b2f83e27c2f98a9c1deaaff2e25;hb=0945e7219a3995158d76267d26f77f57659c8578;hp=42220a34e33a0e295a63c4fbc58123c86408a9de;hpb=eabaea3732b3c8cfa3b0324aeaca2c5bb39c4be7;p=lilypond.git

diff --git a/Documentation/notation/staff.itely b/Documentation/notation/staff.itely
index 42220a34e3..8d37fe33fa 100644
--- a/Documentation/notation/staff.itely
+++ b/Documentation/notation/staff.itely
@@ -3,7 +3,8 @@
     Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
 
     When revising a translation, copy the HEAD committish of the
-    version that you are working on.  See TRANSLATION for details.
+    version that you are working on.  For details, see the Contributors'
+    Guide, node Updating translation committishes..
 @end ignore
 
 @c \version "2.12.0"
@@ -754,6 +755,7 @@ Learning Manual:
 @rlearning{Visibility and color of objects}.
 
 Notation Reference:
+@ref{Changing context default settings},
 @ref{Staff symbol},
 @ref{Ossia staves},
 @ref{Hidden notes},
@@ -784,6 +786,9 @@ engraver:
 \override NoteHead #'no-ledgers = ##t
 @end example
 
+For the Known issues and warnings associated with
+@code{\RemoveEmptyStaffContext} see @ref{Changing context default
+settings}.
 
 @node Writing parts
 @subsection Writing parts
@@ -978,7 +983,10 @@ For details, see @ref{Modifying context plug-ins}.
 @cindex instrument names, changing
 @cindex changing instrument names
 
-Instrument names may be changed in the middle of a piece:
+Instrument names may be changed in the middle of a piece.
+However, remember that @code{instrumentName} will not be
+displayed in the middle of the piece, as it only appears
+on the first staff:
 
 @lilypond[verbatim,quote,ragged-right,relative=1]
 \set Staff.instrumentName = #"First"
@@ -1085,12 +1093,13 @@ The @code{\quoteDuring} command is used to indicate the point where the
 quotation begins.  It is followed by two arguments: the name of the
 quoted voice, as defined with @code{\addQuote}, and a music expression
 that indicates the duration of the quote, usually spacer rests or
-multi-measure rests.  The corresponding music from the quoted voice is
-inserted into the music expression:
+multi-measure rests.  The corresponding music (including all articulations,
+dynamics, markup, etc.) from the quoted voice is inserted into the music
+expression:
 
 @lilypond[verbatim,quote]
 flute = \relative c'' {
-  a4 gis g gis
+  a4 gis g->\f gis^\markup{quoted}
 }
 \addQuote "flute" { \flute }
 
@@ -1135,6 +1144,23 @@ It is possible to tag quotations with unique names in order to
 process them in different ways.  For details about this procedure,
 see @ref{Using tags}.
 
+It is also possible to adjust which objects from the original voice are quoted
+by changing the @code{quotedEventTypes} property.  By default, its value is
+@code{#'(StreamEvent)}, which means that everything is quoted.  Setting it
+to e.g. @code{#'(note-event rest-event tie-event)} causes lilypond to quote
+only notes, rests and ties, but no articulations, markup or dynamics.
+
+@lilypond[verbatim,quote]
+clarinet = \relative c'' {
+  a4 gis g->\f gis^\markup{quoted}
+}
+\addQuote "clarinet" { \clarinet }
+
+\relative c' {
+  \set Score.quotedEventTypes = #'(note-event rest-event tie-event)
+  c4 cis \quoteDuring #"clarinet" { s2 }
+}
+@end lilypond
 
 @snippets
 
@@ -1147,6 +1173,7 @@ see @ref{Using tags}.
 @cindex rest-event
 
 @funindex quotedEventTypes
+@funindex quotedCueEventTypes
 
 @lilypondfile[verbatim,lilyquote,texidoc,doctitle]
 {quoting-another-voice.ly}
@@ -1205,9 +1232,9 @@ notes into a part.  The syntax is as follows:
 \cueDuring #@var{partname} #@var{voice} @var{music}
 @end example
 
-This command copies the corresponding measures from @var{partname}
-into a @code{CueVoice} context.  The @code{CueVoice} is created
-implicitly, and occurs simultaneously with @var{music}, which
+This command copies only the notes and rests from the corresponding measures
+from @var{partname} into a @code{CueVoice} context.  The @code{CueVoice} is
+created implicitly, and occurs simultaneously with @var{music}, which
 creates a polyphonic situation.  The @var{voice} argument
 determines whether the cue notes should be notated as a first or
 second voice; @code{UP} corresponds to the first voice, and
@@ -1215,7 +1242,7 @@ second voice; @code{UP} corresponds to the first voice, and
 
 @lilypond[verbatim,quote]
 oboe = \relative c'' {
-  r2 r8 d16 f e g f a
+  r2 r8 d16(\f f e g f a)
   g8 g16 g g2.
 }
 \addQuote "oboe" { \oboe }
@@ -1231,6 +1258,30 @@ In the above example, the @code{Voice} context had to be
 explicitly declared, or else the entire music expression would
 belong to the @code{CueVoice} context.
 
+It is possible to adjust which aspects of the music are quoted with
+@code{\cueDuring} by setting the @code{quotedCueEventTypes} property.  Its
+default value is @code{#'(note-event rest-event tie-event beam-event
+tuplet-span-event)}, which means that only notes, rest, ties, beams and
+tuplets are quoted, but not articulations, dynamic marks, markup etc.
+
+@lilypond[verbatim,quote]
+oboe = \relative c'' {
+  r2 r8 d16(\f f e g f a)
+  g8 g16 g g2.
+}
+\addQuote "oboe" { \oboe }
+
+\new Voice \relative c'' {
+  \set Score.quotedCueEventTypes = #'(note-event rest-event tie-event
+                                      beam-event tuplet-span-event
+                                      dynamic-event slur-event)
+  \cueDuring #"oboe" #UP { R1 }
+  g2 c,
+}
+@end lilypond
+
+
+
 The name of the cued instrument can be printed by setting the
 @code{instrumentCueName} property in the @code{CueVoice} context.