Merge with master

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

diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index 5ecebac1c3446570c63feda2536101e3635b7d03..6a38e581bd564144e990bde0b9e176a918d7f05a 100644 (file)
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -1,37 +1,16 @@
 \header {
-    texidoc = "Rests under beams are only moved if necessary."
-}
 
-\version "2.3.17"
+  texidoc = "Rests under beams are shifted upon
+collision."
 
-fig =   \relative c' {
-    <a c e>8[ r <c e a> r <e a c> r <a c e>]  r |
 }
-
-                        
-\score {
-   \relative c' \new Staff {
-     \fig 
-      \transpose c c,  \fig
-      \new Voice { \stemUp \transpose c f  \fig }
-      <<
-         \\
-         \transpose f c \fig
-      >>
-      
-      <<
-         { \transpose c c' \fig }
-         \\
-         {} 
-      >>
-      
-      << \transpose c c' \fig \\
-         \transpose f c \fig
-      >>
-  }
-
-  \paper {
-      raggedright = ##t
-  }
+\version "2.10.7"
+\paper {
+  ragged-right = ##t
+}
+  
+\relative c''' {
+  \stemDown b8[ r b]
+  \stemUp b,,8[ r b] 
 }