X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fquote-during.ly;h=aa14aef30cac9d70ff11833b7512ff22e4436150;hb=53ab418e0bb8f272082db295b38a1dbb2ccfca65;hp=43e855dad9d98f199bef6e91add7d4d07f5c305e;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git diff --git a/input/regression/quote-during.ly b/input/regression/quote-during.ly index 43e855dad9..aa14aef30c 100644 --- 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.7.39" +\version "2.14.0" \layout { ragged-right = ##t } @@ -16,23 +16,25 @@ 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 } << \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'' << - \set Staff.instrument = "orig+quote" + \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. } } >> >>