Merge remote branch 'origin/master' into release/unstable

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

diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly
index 3c8d4ae6e146d9865e34488cf5bc04f8f8b7d019..4dca1efc9ace4eb63392e6044e728791e34e0e1b 100644 (file)
--- a/input/regression/rest-polyphonic.ly
+++ b/input/regression/rest-polyphonic.ly
@@ -1,20 +1,23 @@
 \header {
 
-  texidoc = "In polyphonic situations, rests are moved down
-even if there is no opposite note or rest. The amount is two
-@code{staff-space}s. "
+  texidoc = "In polyphonic situations, rests are moved according
+to their @code{direction} even if there is no opposite note or rest.
+The amount in @code{staff-position}s is set by @code{voiced-position}."
 
 }
 
-\layout { raggedright = ##t }
+\layout { ragged-right = ##t }
 
 
-\version "2.6.0"
+\version "2.16.0"
 
 
 \new Staff  \relative c' {
-  << { r8 g''4 g8 r g4 g8 } \\
-     { d,4    r   d   r   } >>
+  << { r8 g''4 g8       r g4 g8 } \\
+     { d,4    r \stemUp b   r   } >>
+ \override Staff.Rest.voiced-position = 2
+  << { r8 g''4 g8       r g4 g8 } \\
+     { d,4    r \stemUp b   r   } >>
 }