* input/regression/markup-syntax.ly: remove \score.

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

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index c4e6e803ffde7c64cf154ed815c0141815752488..156dabd951a45c61f4aabd356f328adcb77ef3b0 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,23 +1,19 @@
-#(ly:set-option 'old-relative)
-\version "2.1.22"
+\version "2.4.0"
 \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"
-copyright =     "public domain"
 }
 
 
 twovoice =
-\notes \relative c' \context Staff \notes << 
+ \relative c' \context Staff  << 
         {  g4 f f e e d d c } 
 \\ {  c4 c  d d e e f f }
 >>
 
-twovoicechords = \context Staff \notes <<
+twovoicechords = \context Staff  <<
  \relative c' {
  e4 d c b a g f
        }\\
@@ -28,13 +24,13 @@ twovoicechords = \context Staff \notes <<
 >>
 
 
-threevoice =  \context Staff \notes <<
+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''
+hairyChord = \context Staff  \relative c''
     << e \\
       fis, \\
       cis' \\
@@ -44,7 +40,7 @@ hairyChord =  \context Staff \notes \relative c''
 
 
 \score{
-       \notes { \transpose c c' {
+        { \transpose c c' {
           \twovoice
           \twovoicechords
           \threevoice   }