Merge commit 'origin' into beamlets2

[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 bac9ef3ea91df44064927769e6ff881f17d4f936..13da99eacd10ccbca658ef314dfac8e0e4b96b56 100644 (file)
--- a/input/new/quoting-another-voice.ly
+++ b/input/new/quoting-another-voice.ly
@@ -1,37 +1,45 @@
-\version "2.11.10"
-\layout { ragged-right= ##t }
+\version "2.12.0"
 \header {
   lsrtags = "staff-notation"
-  texidoc = "With @code{\\quote}, fragments of previously entered
-music may be quoted. @code{quotedEventTypes} will determines what
-things 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
 
-\addQuote quoteMe \quoteMe 
-original = \relative c'' { c8 d s2 es8 gis8 }
+original = \relative c'' {
+  c8 d s2
+  \once \override NoteColumn #'ignore-collision = ##t
+  es8 gis8
+}
 
 <<
-    \new Staff {
-       \set Staff.instrumentName = "quoteMe"
-       \quoteMe
-    }
-    \new Staff {
-       \set Staff.instrumentName = "orig"
-       \original
+  \new Staff {
+    \set Staff.instrumentName = #"quoteMe"
+    \quoteMe
+  }
+  \new Staff {
+    \set Staff.instrumentName = #"orig"
+    \original
+  }
+  \new Staff \relative c'' <<
+    \set Staff.instrumentName = #"orig+quote"
+    \set Staff.quotedEventTypes =
+      #'(note-event articulation-event)
+    \original
+    \new Voice {
+      s4
+      \set fontSize = #-4
+      \override Stem #'length-fraction = #(magstep -4)
+      \quoteDuring #"quoteMe" { \skip 2. }
     }
-    \new Staff \relative c'' <<
-       \set Staff.instrumentName = "orig+quote"        
-       \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
-       \new Voice {
-           s4
-           \set fontSize = #-4
-           \override Stem #'length-fraction = #(magstep -4)
-           \quoteDuring #"quoteMe" { \skip 2. }
-       }
-    >>
+  >>
 >>