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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 3dd98f152e..eeea895cdc 100644
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,77 +1,73 @@
-\version "1.7.5"
+\version "2.19.21"
 \header{
-texidoc="
-Normal collisions. We have support for polyphony, where the
-middle voices are horizontally shifted.
+  texidoc="
+In addition to normal collision rules, there is support for polyphony, 
+where the collisions 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 } 
->
+\relative \context Staff  << 
+  {  g4 f f e e d d c } 
+  \\ {  c4 c  d d e e f f }
+>>
 
-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>
-		<a c> <a c>  
-	}
->
+twovoicechords = \context Staff  <<
+  \relative {
+    e'4 d c b a g f
+  }\\
+  \relative {
+    <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 }
->
+threevoice = \context Staff  <<
+  { g4 f e f g a g2 } \\
+  {  c4 d e d c d es } \\
+  { e4 e e e e e e e  }
+>>
 
-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
+hairyChord = \context Staff  \relative
+<<
+  e'' \\
+  fis, \\
+  cis' \\
+  \\
+  ais
+>>
 
-	fis
-     }
->
+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' {
+      \twovoice
+      \twovoicechords
+      \threevoice
+    }
+    \hairyChord
+    \break
+    \minims \bar "||"
+    \semibreves \bar "||"
+    \sequence
+  }
 
-\score{
-	\notes \transpose c c' {
-	   \twovoice
-	   \twovoicechords
-	
-	\threevoice 
-	 \hairyChord
-	}
-	
-%	\midi { \tempo 4:80 }
-}