Merge master into nested-bookparts

[lilypond.git] / input / new / quoting-another-voice.ly

diff --git a/input/new/quoting-another-voice.ly b/input/new/quoting-another-voice.ly
index e6fff64c1363537c33baf5f5ff4f1ea85e3354d2..b0e75a9d32bc8ad4837081f653dff7744c597d12 100644 (file)
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,16 +1,20 @@
-\version "2.11.10"
+\version "2.11.61"
 \header {
   lsrtags = "staff-notation"
-  texidoc = "With @code{\\quote}, fragments of previously entered
-music may be quoted.  @code{quotedEventTypes} will determines which
-items are quoted.  In this example, a 16th rest is not quoted, since
-@code{rest-event} is not in @code{quotedEventTypes}."
+  texidoc = "The @code{quotedEventTypes} property determines the
+music event types that are quoted.  The default value is
+@code{(note-event rest-event)}, which means that only notes and
+rests of the quoted voice appear in the @code{\\quoteDuring}
+expression.  In the following example, a 16th rest is not quoted
+since @code{rest-event} is not in @code{quotedEventTypes}."
   doctitle = "Quoting another voice"
 }
 
-quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
-
+quoteMe = \relative c' {
+  fis4 r16 a8.-> b4\ff c
+}
 \addQuote quoteMe \quoteMe
+
 original = \relative c'' {
   c8 d s2
   \once \override NoteColumn #'ignore-collision = ##t
@@ -28,13 +32,14 @@ original = \relative c'' {
   }
   \new Staff \relative c'' <<
     \set Staff.instrumentName = #"orig+quote"
-    \set Staff.quotedEventTypes = #'(note-event articulation-event)
+    \set Staff.quotedEventTypes =
+      #'(note-event articulation-event)
     \original
     \new Voice {
       s4
-           \set fontSize = #-4
-           \override Stem #'length-fraction = #(magstep -4)
-           \quoteDuring #"quoteMe" { \skip 2. }
+      \set fontSize = #-4
+      \override Stem #'length-fraction = #(magstep -4)
+      \quoteDuring #"quoteMe" { \skip 2. }
     }
   >>
 >>