release commit

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 89e2ec131def3c97281f352bc75ba9c413592b88..60c205a640397577020b2d988b081ffbf2ffeb7b 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,78 +1,56 @@
-\version "1.7.6"
+#(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.
+In addition to normal collision rules, there is support for polyphony, 
+where the collosion are avoided by shifting middle voices horizontally.
 "
 filename =      "collisions.ly"
-description =   "random counterpoint to test collisions"
 enteredby =     "HWN,JCN"
 copyright =     "public domain"
-Tested =        "test the Collision resolution "
 }
 
 
 twovoice =
-\notes \relative c' \context Staff \notes < 
-       \context Voice=i { \stemDown c4 c  d d e e f f }
-       \context Voice=ii { \stemUp g4 f f e e d d c } 
->
-
-twovoicechords = \context Staff \notes <
-       \context Voice = i \relative c' {
-               \stemUp e4 d c b a g f
-       }
-       \context Voice = ii \relative c' {
-               \stemDown <<a c>>4 <<a c>>4 <<a c>>4 <<a c>>4 <<a c>>
-               <<a c>> <<a c>>  
+\notes \relative c' \context Staff \notes << 
+        {  g4 f f e e d d c } 
+\\ {  c4 c  d d e e f f }
+>>
+
+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>  
        }
->
-
+>>
 
-threevoice =  \context Staff \notes <
-       \context Voice=i { \stemUp g4 f e f g a g2 }
-       \context Voice=ii { \stemUp \shiftOn
-               e4 e e e e e e e  }
-       \context Voice=iii { \stemDown c4 d e d c d es }
->
 
-hairyChord =  \context Staff \notes\relative c' <
-     \context Voice=one {
-\shiftOff
-       \stemUp 
-       e4 
-     }
-     
-     \context Voice=two {
-       \stemUp
-       \shiftOn
- \property Voice.NoteColumn \override #'horizontal-shift = #1
-       cis
-     }
-     
-     \context Voice=three {    \shiftOnn
-       \stemUp 
-       ais
-     }
-     
-     \context Voice=four {
-        \stemDown
-       \shiftOn
+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 c' {
+       \notes { \transpose c c' {
           \twovoice
           \twovoicechords
-       
-       \threevoice 
+          \threevoice   }
         \hairyChord
        }
        
 %      \midi { \tempo 4:80 }
 }
-%% new-chords-done %%
\ No newline at end of file
+