X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=input%2Fregression%2Fcollisions.ly;h=eeea895cdcf51318fc24f7bea4c9b66a0b2703fe;hb=70147a89d3d923e112169a28aac68f991c38e282;hp=7c9d6df14945b9a77a5e701c0ceb3b9815020e0c;hpb=2205ef7a616d73e6a83274816e775426bf41b7bd;p=lilypond.git
diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 7c9d6df149..eeea895cdc 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,23 +1,23 @@
-\version "2.7.39"
+\version "2.19.21"
\header{
texidoc="
In addition to normal collision rules, there is support for polyphony,
-where the collosion are avoided by shifting middle voices horizontally.
+where the collisions are avoided by shifting middle voices horizontally.
"
}
twovoice =
-\relative c' \context Staff <<
+\relative \context Staff <<
{ g4 f f e e d d c }
\\ { c4 c d d e e f f }
>>
twovoicechords = \context Staff <<
- \relative c' {
- e4 d c b a g f
+ \relative {
+ e'4 d c b a g f
}\\
- \relative c' {
+ \relative {
4 4 4 4
}
@@ -30,15 +30,33 @@ threevoice = \context Staff <<
{ e4 e e e e e e e }
>>
-hairyChord = \context Staff \relative c''
+hairyChord = \context Staff \relative
<<
- e \\
+ e'' \\
fis, \\
cis' \\
\\
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
}
-