Merge branch 'release/unstable'

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

diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index 4d61ee608bad45bff62d905748239239c22df684..97e158ed90f86993246eb53bf4d5058a434859b2 100644 (file)
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -3,11 +3,11 @@
 
     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 rests is not quoted, since
+things are quoted. In this example, a 16th rest is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
-\version "2.10.0"
+\version "2.14.0"
 \layout {
     ragged-right = ##t
 }
@@ -15,7 +15,7 @@ things are quoted. In this example, a 16th rests is not quoted, since
 
 quoteMe = \relative c' { fis4 r16  a8.-> b4-\ff c }
 
-\addquote quoteMe \quoteMe 
+\addQuote quoteMe \quoteMe 
 original = \relative c'' { c8 d s2 es8 gis8 }
 
 <<
@@ -30,7 +30,9 @@ original = \relative c'' { c8 d s2 es8 gis8 }
     \new Staff \relative c'' <<
        \set Staff.instrumentName = "orig+quote"        
        \set Staff.quotedEventTypes = #'(note-event articulation-event)
-       \original
+       \new Voice {
+           \override Voice . Beam #'collision-voice-only = ##t
+           \original }
        \new Voice {
            s4
            \set fontSize = #-4