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 d17d80d4c50b700fb25409b42a60b77eef2cf40e..1f25719d090caecfe125a0ce84588ec17384e989 100644 (file)
--- a/input/regression/quote-during.ly
+++ b/input/regression/quote-during.ly
@@ -4,11 +4,11 @@
     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 rests is not quoted, since
+quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.11.10"
+\version "2.16.0"
 \layout {
     ragged-right = ##t
 }
@@ -32,7 +32,9 @@ original = \relative c'' { c8 d s2 es8 gis8 }
        
        \set Staff.instrumentName = "orig+quote"        
        \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
-       { s4 \quoteDuring #"quoteMe" { s2. } }
+       \new Voice {\voiceOne
+           \override Voice . Beam #'collision-voice-only = ##t
+           \original }
+       \new Voice {\voiceTwo s4 \quoteDuring #"quoteMe" { s2. } }
     >>
 >>