release: 1.0.1

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

diff --git a/input/test/collisions.ly b/input/test/collisions.ly
index 6ab2e5f41ee68519bd4ca7d1a5b2ae5404bdd51e..ade5a27a9559606046249f4ab240096fa39d8828 100644 (file)
--- a/input/test/collisions.ly
+++ b/input/test/collisions.ly
@@ -5,13 +5,13 @@ enteredby =    "HWN,JCN";
 copyright =     "public domain";
 Tested =        "test the Collision resolution ";
 }
-\version "0.1.15";
+\version "1.0.0";
 
 
 
 two_voice = \melodic 
-       \multi 2 < 
-         { \stemdown \octave c'; 
+       \type Staff < 
+         { \stemdown
                c4 d e f g2~  g4 a [c8 d e f] c2| }
          { \stemup
                g4 f e g ~ g2 g2  c4 g4 g2 } 
@@ -19,9 +19,9 @@ two_voice = \melodic
        >
 
 two_voice_steminvert = \melodic 
-       \multi 2 <  
+       \type Staff <  
          { 
-               \octave c'; \stemup
+ \stemup
 % the f and g on 4th beat are exceptionally ugh.
                c4 d e f g2 g4 a | }
          { \stemdown
@@ -30,7 +30,7 @@ two_voice_steminvert = \melodic
        >
 
 three_voice = \melodic 
-       \multi 2 <
+       \type Staff <
        { \stemup 
                g4 f e f g a g2 }
        { \stemup \property Voice.hshift = 1 
@@ -41,7 +41,7 @@ three_voice = \melodic
 
 
 rests = \melodic  
-       \multi 2 <
+       \type Staff <
        { \stemup
                | r8 r r r  r r r r 
                [c' b a g] [f e d c]
@@ -53,21 +53,20 @@ rests = \melodic
        >
 
 restsII = \melodic {
-       \octave c'; 
-       \multi 2 < 
+       \type Staff < 
                { \stemup  g' f' e' d' c' b a g f e d c }
                { \stemdown r  r  r  r  r  r r r r r r r }
        >
-       \multi 2 <
+       \type Staff <
                { \stemup  r r r r r r r r  r  r  r  r }
                { \stemdown c d e f g a b c' d' e' f' g' }
        >
        r8 r4
-       \multi 2 <  r8 r8 >
-       \multi 2 <  r8 r8 r8 >
-       \multi 2 <  r8 r8 r8 r8 >
-       \multi 2 <  r r >
-       \multi 2 <  r r r >
+       \type Staff <  r8 r8 >
+       \type Staff <  r8 r8 r8 >
+       \type Staff <  r8 r8 r8 r8 >
+       \type Staff <  r r >
+       \type Staff <  r r r >
        \stemup
        [c''8 r8 c''8 c''8]
        [c8 r8 c8 c8]
@@ -77,7 +76,7 @@ restsII = \melodic {
 }
 
 \score{
-       {  \two_voice  
+       \melodic \transpose c' {  \two_voice  
        \two_voice_steminvert 
        \three_voice  
        \rests