release commit

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 1933d1009785774ffedf33697b84364b188aa804..60c205a640397577020b2d988b081ffbf2ffeb7b 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,79 +1,56 @@
+#(ly:set-option 'old-relative)
+\version "2.1.30"
 \header{
 texidoc="
-Normal collisions. We have support for polyphony, where the
-middle voices are horizontally shifted.
-";
-filename =      "collisions.ly";
-description =   "random counterpoint to test collisions";
-enteredby =     "HWN,JCN";
-copyright =     "public domain";
-Tested =        "test the Collision resolution ";
+In addition to normal collision rules, there is support for polyphony, 
+where the collosion are avoided by shifting middle voices horizontally.
+"
+filename =      "collisions.ly"
+enteredby =     "HWN,JCN"
+copyright =     "public domain"
 }
-\version "1.3.117";
 
-twovoice =  \context Staff \notes < 
-       \context Voice=i { \stemDown c4 d e f g2~  g4 a [c8 d e f] c2| }
-       \context Voice=ii { \stemUp g4 f e g ~ g2 g2  c4 g4 g2 } 
->
 
-twovoicesteminvert =  \context Staff \notes <  
-       % the f and g on 4th beat are exceptionally ugh.
-       \context Voice=i { \stemUp c4 d e f g2 g4 a | }
-       \context Voice=ii { \stemDown g4 f e g  g2 g2 } 
->
+twovoice =
+\notes \relative c' \context Staff \notes << 
+        {  g4 f f e e d d c } 
+\\ {  c4 c  d d e e f f }
+>>
 
-threevoice =  \context Staff \notes <
-       \context Voice=i { \stemUp g4 f e f g a g2 }
-       \context Voice=ii { \stemUp \property Voice.NoteColumn \override #'horizontal-shift = #1
-               e2  e2  e2  e2 }
-       \context Voice=iii { \stemDown c4 d e d c d es }
->
-
-chordstest =  \context Staff \notes <
-       \context Voice = i \relative c {
-               \stemUp e4 dis c f g f a b b
-       }
-       \context Voice = ii \relative c {
-               \stemDown <a4 c> <a4 c> <a4 e'> <a4 c> <e' a> <e a> <e a> <a c> <a d>
+twovoicechords = \context Staff \notes <<
+ \relative c' {
+ e4 d c b a g f
+       }\\
+ \relative c' {
+        <a c>4 <a c>4 <a c>4 <a c>4 <a c>
+               <a c> <a c>  
        }
->
+>>
 
-hairyChord =  \context Staff \notes\relative c' <
-     \context Voice=one {
- \property Voice.NoteColumn \override #'horizontal-shift = #0
-       \stemUp 
-       e4 
-     }
-     
-     \context Voice=two {
-       \stemUp
- \property Voice.NoteColumn \override #'horizontal-shift = #1
-       cis
-     }
-     
-     \context Voice=three {
- \property Voice.NoteColumn \override #'horizontal-shift = #2
 
-       \stemUp 
-       ais
-     }
-     
-     \context Voice=four {
-        \stemDown
- \property Voice.NoteColumn \override #'horizontal-shift = #1
+threevoice = \context Staff \notes <<
+        { g4 f e f g a g2 } \\
+        {  c4 d e d c d es } \\
+        { e4 e e e e e e e  }
+>>
 
-       fis
-     }
->
+hairyChord = \context Staff \notes \relative c''
+    << e \\
+      fis, \\
+      cis' \\
+      \\
+      ais
+      >>
 
 
 \score{
-       \notes \transpose c'' {  \twovoice  
-       \twovoicesteminvert 
-       \threevoice \break
-        \chordstest
+       \notes { \transpose c c' {
+          \twovoice
+          \twovoicechords
+          \threevoice   }
         \hairyChord
        }
        
 %      \midi { \tempo 4:80 }
 }
+