release commit

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 6c7c28b9426f7249dd3ce26bdc5caf9b405773d1..60c205a640397577020b2d988b081ffbf2ffeb7b 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,9 +1,9 @@
 #(ly:set-option 'old-relative)
-\version "1.9.2"
+\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"
 enteredby =     "HWN,JCN"
@@ -12,35 +12,35 @@ copyright =          "public domain"
 
 
 twovoice =
-\notes \relative c' \context Staff \notes < 
+\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 <
+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>>  
+        <a c>4 <a c>4 <a c>4 <a c>4 <a c>
+               <a c> <a c>  
        }
->
+>>
 
 
-threevoice =  \context Staff \notes <
+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  }
->
+>>
 
-hairyChord =  \context Staff \notes \relative c''
-    < e \\
+hairyChord = \context Staff \notes \relative c''
+    << e \\
       fis, \\
       cis' \\
       \\
       ais
-      >
+      >>
 
 
 \score{