new file.

[lilypond.git] / input / regression / rest-collision.ly

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index c2628739c47b8fb2e067cbc4dfd2599ace05a82b..792873a7108a40322fbff7b05dce020749a25a2a 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,4 +1,5 @@
-\version "1.7.16"
+
+\version "2.4.0"
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
@@ -9,55 +10,46 @@ cases.
 "
 }
 
-scale =  \notes \relative c' {
+scale =  \relative c' {
   c8 d e f g a b c c d e f g a b c
 
 }
-rests =  \notes             {
+rests =              {
   r r r  r r r r r r r r r r r r r
 } 
-different = < \context Voice = one {
-      \stemUp
-      \notes \relative c'' {
+different = <<  {
+       \relative c'' {
         r8 a e4 a e
       }
-    }
-    \context Voice = two {
-      \stemDown
-      \notes \relative c'' {
+    }\\ {
+      
+       \relative c'' {
         r1
-      }} >
+      }} >>
 
-scales =  \context Staff \notes <
-       \context Voice=i { \stemUp r1 r2 r2   \scale    c''1 c'2 a'2 \rests  }
-       \context Voice = ii { \stemDown a'1 a'2 d'2 \rests r1 r2 r2  \scale }
->
+scales = \context Staff  <<
+        {  r1 r2 r2   \scale    c''1 c'2 a'2 \rests  }
+        \\
+        { a'1 a'2 d'2 \rests r1 r2 r2  \scale }
+>>
 
-restsII =  \context Staff \notes {
+restsII = \context Staff  {
        r4 r8
-       \context Staff < { \stemUp r8 } { \stemDown r8} >
-       \context Staff < {\stemUp r8} r8 { \stemDown r8} >
-       \context Staff < {\stemUp r8} r8 r8 { \stemDown r8} >
-       \context Staff < {\stemUp r} { \stemDown r} >
-       \context Staff < {\stemUp r} r { \stemDown r} >
-       \stemUp
-       \transpose c c' { [c''8 r8 c''8 c''8]
-       [c8 r8 c8 c8]
-       [c8 r8 r8 c'''8]        
-       \stemDown
-       [c8 r8 c8 c8]
-       [c''8 r8 c''8 c''8]
-       [c'8 r8 r8 c'''8]
+       \context Staff << {  r8 } \\{  r8} >>
+       \context Staff << { r8} r8 \\{  r8} >>
+       \context Staff << { r8} r8 r8 \\ {  r8} >>
+       \context Staff << { r} \\ {  r} >>
+       \context Staff << { r} r\\ { \stemDown r} >>
        \different      
        }
-}
 
 \score{
-       \notes { 
+        { 
                \scales 
                \restsII 
        }
+       \layout { raggedright = ##t }
 }      
 
 
-%% new-chords-done %%
+