Merge branch 'stable/2.16' into staging

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 547f87273a72c9b942a92de5b50a9d079d9d016a..0383cccad28166544aaca603fa6fe01b4284a999 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,7 +1,7 @@
 
-\version "1.9.2"
+\version "2.16.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,54 +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 }
->
-
-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} >
-       \stemUp
-       \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]
-       \different      
-       }
+different = <<  {
+  \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  {
+  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 
 }
 
-\score{
-       \notes { 
-               \scales 
-               \restsII 
-       }
-}      
+