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 c22f535ad449088c42ae7898fecbf689704e81de..a413b7f4ca907b2a531a8b8668cc691a2120afca 100644 (file)
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,17 +1,23 @@
-\version "1.5.68"
+\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."
 
 }
 
-\score { \notes\relative c'' 
+\layout { ragged-right= ##t }
+
+\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] 
+  
 }
+
+