Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index 60c205a640397577020b2d988b081ffbf2ffeb7b..e3e68163251dbfb390614e079c7ce1b4f8083a04 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,56 +1,52 @@
-#(ly:set-option 'old-relative)
-\version "2.1.30"
+\version "2.12.0"
 \header{
-texidoc="
+  texidoc="
 In addition to normal collision rules, there is support for polyphony, 
-where the collosion are avoided by shifting middle voices horizontally.
+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 << 
-        {  g4 f f e e d d c } 
-\\ {  c4 c  d d e e f f }
+\relative c' \context Staff  << 
+  {  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>  
-       }
+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 \notes <<
-        { g4 f e f g a g2 } \\
-        {  c4 d e d c d es } \\
-        { e4 e e e e e e e  }
+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''
-    << e \\
-      fis, \\
-      cis' \\
-      \\
-      ais
-      >>
-
-
-\score{
-       \notes { \transpose c c' {
-          \twovoice
-          \twovoicechords
-          \threevoice   }
-        \hairyChord
-       }
-       
-%      \midi { \tempo 4:80 }
-}
+hairyChord = \context Staff  \relative c''
+<<
+  e \\
+  fis, \\
+  cis' \\
+  \\
+  ais
+>>
+
+
+  {
+    \transpose c c' {
+      \twovoice
+      \twovoicechords
+      \threevoice
+    }
+    \hairyChord
+  }
+