Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 7cc252579afb3fa3c1a8d21da485c757dbaed644..1b98c177cf090b0015dff48864d626c055fece33 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
-\version "2.3.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,6 +10,8 @@ cases.
 "
 }
 
+\layout { ragged-right = ##t }
+
 scale =  \relative c' {
   c8 d e f g a b c c d e f g a b c
 
@@ -18,38 +20,38 @@ 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 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 }
+  {  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 
+}
+
+