Merge branch 'stable/2.16' into staging

[lilypond.git] / input / regression / quote-during.ly

diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly
index 9f9c376e91dfec5e048075b45695acd3f2e28b68..1f25719d090caecfe125a0ce84588ec17384e989 100644 (file)
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -1,44 +1,40 @@
 \header
 {
 
-    texidoc = "With @code{\\quoteDuring}, fragments of previously
-entered music may be quoted. @code{quotedEventTypes} will determines
-what things are quoted. In this example, a 16th rests is not quoted,
-since @code{rest-event} is not in @code{quotedEventTypes}."
+    texidoc = "With @code{\\cueDuring} and @code{\\quoteDuring},
+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}."
 
 }
-\version "2.4.0"
+\version "2.16.0"
 \layout {
-    raggedright = ##t
+    ragged-right = ##t
 }
 
 
-quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff }
+quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
-\addquote quoteMe \quoteMe 
+\addQuote quoteMe \quoteMe 
 original = \relative c'' { c8 d s2 es8 gis8 }
 
 <<
     \new Staff {
-       \set Staff.instrument = "quoteMe"
+       \set Staff.instrumentName = "quoteMe"
        \quoteMe
     }
     \new Staff {
-       \set Staff.instrument = "orig"
+       \set Staff.instrumentName = "orig"
        \original
     }
     \new Staff \relative c'' <<
-
-       % setup cue note layout.
-       \context Voice = cue  {
-           \set fontSize = #-4
-           \override Stem #'lengths = #'(2.5 2.5 3.0 3.0)
-           \skip 1
-           }
        
-       \set Staff.instrument = "orig+quote"    
+       \set Staff.instrumentName = "orig+quote"        
        \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
-       { s4 \quoteDuring #"quoteMe"  #1 { r2. } }
+       \new Voice {\voiceOne
+           \override Voice . Beam #'collision-voice-only = ##t
+           \original }
+       \new Voice {\voiceTwo s4 \quoteDuring #"quoteMe" { s2. } }
     >>
 >>