X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=5b03483b6bf4abea02f8c48394bd6b7feae47d5e;hb=0687038a4e9b617bde68cbad29cf0385caef1a99;hp=e3e68163251dbfb390614e079c7ce1b4f8083a04;hpb=eeec992b7029d0982bf4ed0eb3995e9ca99c10e9;p=lilypond.git diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index e3e6816325..5b03483b6b 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,4 +1,4 @@ -\version "2.12.0" +\version "2.16.0" \header{ texidoc=" In addition to normal collision rules, there is support for polyphony, @@ -39,6 +39,24 @@ hairyChord = \context Staff \relative c'' ais >> +minims = << + { e''2 e'' e' d' } \\ + c'' \\ + { c' c' c' c' } \\ + g' >> + +semibreves = << + { e''1 e'' e' d' } \\ + c'' \\ + { c' c' c' c' } \\ + g' >> + +sequence = << + \new Voice { \voiceOne g''1 e''2 d'' e'' d'' } + \new Voice { \voiceThree c''2 b' a'1 b' } + \new Voice { \voiceFour g'1 e'2 f'2 a'1 } + \new Voice { \voiceTwo c'1 c'2 d' e'2 d' } +>> { \transpose c c' { @@ -47,6 +65,9 @@ hairyChord = \context Staff \relative c'' \threevoice } \hairyChord + \break + \minims \bar "||" + \semibreves \bar "||" + \sequence } -