Imported Upstream version 2.19.45

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 792873a7108a40322fbff7b05dce020749a25a2a..3b7862520c89dfd33d15d8adebb40a96693c46ed 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
-\version "2.4.0"
+\version "2.19.21"
 \header{
-texidoc="
+  texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
 be under beams.  Rests should be move by integral number of spaces
 inside the staff, and by half spaces outside.  Notice that the half
@@ -10,46 +10,48 @@ cases.
 "
 }
 
-scale =  \relative c' {
-  c8 d e f g a b c c d e f g a b c
+\layout { ragged-right = ##t }
+
+scale =  \relative {
+  c'8 d e f g a b c c d e f g a b c
 
 }
 rests =              {
   r r r  r r r r r r r r r r r r r
 } 
 different = <<  {
-       \relative c'' {
-        r8 a e4 a e
-      }
-    }\\ {
-      
-       \relative c'' {
-        r1
-      }} >>
+  \relative {
+    r8 a' e4 a e
+  }
+}\\ {
+  
+  \relative c'' {
+    r1
+  }} >>
 
 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 }
+  {  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  {
-       r4 r8
-       \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{
-        { 
-               \scales 
-               \restsII 
-       }
-       \layout { raggedright = ##t }
-}      
+  r4 r8
+  \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   
+}
+
+
+{ 
+  \scales 
+  \restsII 
+}
+
+