Docs: run convert-ly for 2.14.0.

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 3731a46918c348216f855ca3a97be5b000d1a5cf..884c059dc021273c92bb0223d2e4ed00a66e72b1 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,6 +1,7 @@
-\version "1.3.146"
+
+\version "2.14.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
@@ -9,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 = < \context Voice = one {
-      \stemUp
-      \notes \relative c'' {
-        r8 a e4 a e
-      }
-    }
-    \context Voice = two {
-      \stemDown
-      \notes \relative c'' {
-        r1
-      }} >
-
-scales =  \context Staff \notes <
-       \context Voice=i { \stemUp r1 r2 r2   \scale    c''1 c'2 a'2 \rests  }
-       \context Voice = ii { \stemDown a'1 a'2 d'2 \rests r1 r2 r2  \scale }
->
-
-restsII =  \context Staff \notes {
-       r4 r8
-       \context Staff < { \stemUp r8 } { \stemDown r8} >
-       \context Staff < {\stemUp r8} r8 { \stemDown r8} >
-       \context Staff < {\stemUp r8} r8 r8 { \stemDown r8} >
-       \context Staff < {\stemUp r} { \stemDown r} >
-       \context Staff < {\stemUp r} r { \stemDown r} >
-       \stemUp
-       \transpose 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   
 }
 
-\score{
-       \notes { 
-               \scales 
-               \restsII 
-       }
-}      
+
+{ 
+  \scales 
+  \restsII 
+}
+
+       
+