X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Frest-collision.ly;h=3b7862520c89dfd33d15d8adebb40a96693c46ed;hb=79c17e0eaedca79e5f7605f5b9f92db27c68e679;hp=4d93a1e35a2439f4ccacdad46f19b95d700eddf2;hpb=ecaf73bb03e974018c17e3051b3ac3a805dd1653;p=lilypond.git

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 4d93a1e35a..3b7862520c 100644
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
-\version "2.1.28"
+\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 = \notes \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 = \notes             {
+rests =              {
   r r r  r r r r r r r r r r r r r
 } 
 different = <<  {
-      \notes \relative c'' {
-        r8 a e4 a e
-      }
-    }\\ {
-      
-      \notes \relative c'' {
-        r1
-      }} >>
-
-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 }
+  \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 }
 >>
 
-restsII = \context Staff \notes {
-	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{
-	\notes { 
-		\scales 
-		\restsII 
-	}
-	\paper { raggedright = ##t }
-}	
+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	
+}
+
+
+{ 
+  \scales 
+  \restsII 
+}
+
+