Merge branch 'master' into translation

[lilypond.git] / input / regression / whiteout-lower-layers.ly

diff --git a/input/regression/whiteout-lower-layers.ly b/input/regression/whiteout-lower-layers.ly
index 1284cee54b002e988ffa7107a2201883b5c4a940..15c59e5770b04eee6afea06de97cfcbfec19078b 100644 (file)
--- a/input/regression/whiteout-lower-layers.ly
+++ b/input/regression/whiteout-lower-layers.ly
@@ -1,8 +1,7 @@
 \version "2.19.32"
 
 \header { texidoc = "If the 'whiteout property of a
-grob is set to a number or #t, or if the 'whiteout-box
-property is set to #t, that part of all objects
+grob is set to a number or #t, that part of all objects
 in lower layers which falls under the extent of
 the grob's whiteout area is whited out.  Here the
 TimeSignature whites out the Tie but not the StaffSymbol.
@@ -11,22 +10,35 @@ TimeSignature whites out the Tie but not the StaffSymbol.
 
 \relative {
   \time 3/4
-  \override Staff.StaffSymbol.layer = #4
-  \once \override Tie.layer = #2
+  \override Staff.StaffSymbol.layer = 4
+  \once \override Tie.layer = 2
   b'2.~
-  \once \override Staff.TimeSignature.whiteout = #3
-  \once \override Staff.TimeSignature.layer = #3
+  \once \override Staff.TimeSignature.whiteout = ##t
+  \once \override Staff.TimeSignature.layer = 3
   \time 5/4
   b4
 }
 
 \relative c' {
   \time 3/4
-  \override Staff.StaffSymbol.layer = #4
-  \once \override Tie.layer = #2
+  \override Staff.StaffSymbol.layer = 4
+  \once \override Tie.layer = 2
   b'2.~
-  \once \override Staff.TimeSignature.whiteout = ##t
-  \once \override Staff.TimeSignature.layer = #3
+  \once \override Staff.TimeSignature.whiteout-style = #'rounded-box
+  \once \override Staff.TimeSignature.whiteout = 3
+  \once \override Staff.TimeSignature.layer = 3
+  \time 5/4
+  b4
+}
+
+\relative c' {
+  \time 3/4
+  \override Staff.StaffSymbol.layer = 4
+  \once \override Tie.layer = 2
+  b'2.~
+  \once \override Staff.TimeSignature.whiteout-style = #'outline
+  \once \override Staff.TimeSignature.whiteout = 3
+  \once \override Staff.TimeSignature.layer = 3
   \time 5/4
   b4
 }