Doc-fr: NR-1.5.2 merging rests

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

diff --git a/input/regression/rest-note-collision.ly b/input/regression/rest-note-collision.ly
index 9b8f1a802817c93778be4767951a8159e638fd34..33c81df9e421fc292c85f70bfc5d9ec6aed03d2d 100644 (file)
--- a/input/regression/rest-note-collision.ly
+++ b/input/regression/rest-note-collision.ly
@@ -7,12 +7,12 @@
        }
 
 
-\version "2.9.18"
-\new Staff {
+\version "2.19.21"
 
+music = {
   <<
-    \relative c'' {
-      f e d c b a g f e d c
+    \relative {
+      f'' e d c b a g f e d c
     }
     \\
     {
@@ -24,8 +24,20 @@
       r4 r r r r r r r r r r
     }
     \\
-    \relative c'' {
-      f e d c b a g f e d c
+    \relative {
+      f'' e d c b a g f e d c
     }
   >>
 }
+
+\score {
+  \new Staff { \music }
+}
+
+\score {
+  \new Staff { \override Staff.Rest.style = #'z \music }
+}
+
+\score {
+  \new Staff { \override Staff.Rest.style = #'classical \music }
+}