X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollisions.ly;h=cc2692cf2994acee7f401420c1aad5abbd27b5a8;hb=d2e7425b88e579fe53989106965fa13eab551c92;hp=3dd98f152e266769d513dfab02d91f036fab8fee;hpb=c81b75a62bd21b85642b76ce364b5016087bce24;p=lilypond.git

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 3dd98f152e..cc2692cf29 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,77 +1,56 @@
-\version "1.7.5"
+#(ly:set-option 'old-relative)
+\version "1.9.8"
 \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 "
 }
 
 
 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 <a4 c> <a4 c> <a4 c> <a4 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 }
 }
+