Imported Upstream version 2.14.2

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 4854553c592f7fbf46ccd58d704cdcdde60771dd..9ba5c5bf2540e233baecf3c9152e95c4122511e0 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,56 +1,52 @@
-#(ly:set-option 'old-relative)
-\version "1.9.1"
+\version "2.14.0"
 \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"
-enteredby =     "HWN,JCN"
-copyright =     "public domain"
 }
 
 
 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>>  
-       }
->
-
-
-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 \\
-      fis, \\
-      cis' \\
-      \\
-      ais
-      >
-
-
-\score{
-       \notes { \transpose c c' {
-          \twovoice
-          \twovoicechords
-          \threevoice   }
-        \hairyChord
-       }
-       
-%      \midi { \tempo 4:80 }
-}
+\relative c' \context Staff  << 
+  {  g4 f f e e d d c } 
+  \\ {  c4 c  d d e e f f }
+>>
+
+twovoicechords = \context Staff  <<
+  \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  <<
+  { 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  \relative c''
+<<
+  e \\
+  fis, \\
+  cis' \\
+  \\
+  ais
+>>
+
+
+  {
+    \transpose c c' {
+      \twovoice
+      \twovoicechords
+      \threevoice
+    }
+    \hairyChord
+  }
+