* scripts/lilypond-book.py (output_dict): remove support for the

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 3731a46918c348216f855ca3a97be5b000d1a5cf..fe3ecd372785fe76163f191000bbe79d0f77aa33 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,4 +1,5 @@
-\version "1.3.146"
+
+\version "1.9.4"
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
@@ -16,38 +17,37 @@ scale =  \notes \relative c' {
 rests =  \notes             {
   r r r  r r r r r r r r r r r r r
 } 
-different = < \context Voice = one {
-      \stemUp
+different = <<  {
       \notes \relative c'' {
         r8 a e4 a e
       }
-    }
-    \context Voice = two {
-      \stemDown
+    }\\ {
+      
       \notes \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 \notes <<
+        {  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 {
        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} >
+       \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} >>
        \stemUp
-       \transpose c'' { [c''8 r8 c''8 c''8]
-       [c8 r8 c8 c8]
-       [c8 r8 r8 c'''8]        
+       \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]
+        c8[ r8 c8 c8]
+        c''8[ r8 c''8 c''8]
+        c'8[ r8 r8 c'''8]
        \different      
        }
 }
@@ -60,3 +60,4 @@ restsII =  \context Staff \notes {
 }      
 
 
+