Merge branch 'master' into dev/texi2html

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

diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index 6219411ab91c2fcd54305ff7a0b15cb7f64ed5f4..39736d66668e86c115dbff7d75ff0d3072d4ab75 100644 (file)
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,18 +1,23 @@
-\version "1.7.6"
+\version "2.11.51"
 \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] 
+  
 }
-%% new-chords-done %%
+
+