Merge commit 'origin/dev/jneeman' into systems-per-page

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index b0681923a826b506379d0a11742545ddc2240aab..1b98c177cf090b0015dff48864d626c055fece33 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
-\version "2.1.22"
+\version "2.12.0"
 \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' {
+\layout { ragged-right = ##t }
+
+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 = <<  {
-      \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 c'' {
+    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 
+}
+
+