* input/regression/newaddlyrics.ly: Remove lilypond-book kludge.

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

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 4cace5b16e432cbe52d5f1ecb3d9a0e9f145aee3..eec4d9e90a5e08406da38e50055e393569d6b72f 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.7"
+\version "2.2.0"
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
@@ -10,11 +10,11 @@ cases.
 "
 }
 
-scale =  \notes \relative c' {
+scale = \notes \relative c' {
   c8 d e f g a b c c d e f g a b c
 
 }
-rests =  \notes             {
+rests = \notes             {
   r r r  r r r r r r r r r r r r r
 } 
 different = <<  {
@@ -27,36 +27,28 @@ different = <<  {
         r1
       }} >>
 
-scales =  \context Staff \notes <<
+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 {
+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      
        }
-}
 
 \score{
        \notes { 
                \scales 
                \restsII 
        }
+       \paper { raggedright = ##t }
 }