Merge commit 'origin' into beamlets2

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

diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index c5f9a42cbf3c477f394dfa5accde5b3c8060db4d..a413b7f4ca907b2a531a8b8668cc691a2120afca 100644 (file)
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,21 +1,23 @@
-#(ly:set-option 'old-relative)
-\version "1.9.8"
+\version "2.12.0"
 \header {
 
-texidoc = "Rests can have pitches--these will be affected by
-transposition and relativization. If a rest has a pitch, rest
-collision will leave it alone."
+  texidoc = "Rests can have pitches--these will be affected by
+transposition and relativization. If a rest has a pitch, rest/rest and
+beam/rest collision resolving will leave it alone."
 
 }
 
-    \paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
-\score { \notes\relative c'' 
+\relative c'' 
 {
-   a4\rest b4\rest c4\rest
+  a4\rest b4\rest c4\rest
 
-<<d \\  d\rest^"rest pitch" >>
-<<d \\  r>> 
-}
+  <<d \\  d\rest^"rest pitch" >>
+  <<d \\  r>>
+  c16 [ d r e] 
+  c16 [ d e\rest^"rest pitch" e] 
+  
 }
 
+