Imported Upstream version 2.19.45

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index c94254378b5b409d32fe929bcffb7a637b1f7826..eeea895cdcf51318fc24f7bea4c9b66a0b2703fe 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,4 +1,4 @@
-\version "2.16.0"
+\version "2.19.21"
 \header{
   texidoc="
 In addition to normal collision rules, there is support for polyphony, 
@@ -8,16 +8,16 @@ 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 {
     <a c>4 <a c>4 <a c>4 <a c>4 <a c>
     <a c> <a c>  
   }
@@ -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
   }
-