Issue 4504/4 edits to tests, docs, and changes.tely

3 files changed, 19 insertions, 8 deletions

diff --git a/input/regression/markup-syntax.ly b/input/regression/markup-syntax.ly
index 489c21fc4f..1350a2447c 100644
--- a/input/regression/markup-syntax.ly
+++ b/input/regression/markup-syntax.ly
@@ -41,7 +41,6 @@
       \super "2"
       " "
       \raise #3.0 \whiteout white-out
-      \raise #3.0 \whiteout white-out-box
       \circle \dynamic p
       \with-color #green Green
       \dynamic sfzp
diff --git a/input/regression/whiteout-lower-layers.ly b/input/regression/whiteout-lower-layers.ly
index 1284cee54b..8549cbc783 100644
--- 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.
@@ -14,7 +13,7 @@ TimeSignature whites out the Tie but not the StaffSymbol.
   \override Staff.StaffSymbol.layer = #4
   \once \override Tie.layer = #2
   b'2.~
-  \once \override Staff.TimeSignature.whiteout = #3
+  \once \override Staff.TimeSignature.whiteout = ##t
   \once \override Staff.TimeSignature.layer = #3
   \time 5/4
   b4
@@ -25,7 +24,8 @@ TimeSignature whites out the Tie but not the StaffSymbol.
   \override Staff.StaffSymbol.layer = #4
   \once \override Tie.layer = #2
   b'2.~
-  \once \override Staff.TimeSignature.whiteout = ##t
+  \once \override Staff.TimeSignature.whiteout-style = #'outline
+  \once \override Staff.TimeSignature.whiteout = #3
   \once \override Staff.TimeSignature.layer = #3
   \time 5/4
   b4
diff --git a/input/regression/whiteout.ly b/input/regression/whiteout.ly
index 1813c8beec..7e10de9727 100644
--- a/input/regression/whiteout.ly
+++ b/input/regression/whiteout.ly
@@ -1,8 +1,9 @@
 \header {
 
   texidoc = "The whiteout command underlays a white background under a
-markup that approximates the outline of the markup.  The whiteout-box
-command underlays a rounded white box under a markup. "
+markup.  The shape is determined by @code{whiteout-style}. The default
+is @code{box} which produces a white rectangle.  @code{outline}
+approximates the outline of the markup."
 
 }
 \version "2.19.32"
@@ -16,5 +17,16 @@ command underlays a rounded white box under a markup. "
   \override TextScript.layer = #'2
   \override TextScript.extra-offset = #'(2 . 4)
   c''4-\markup { \whiteout foo } c
-  c4-\markup { \whiteout \pad-markup #0.5 foo } c
+  c-\markup { \whiteout \pad-markup #0.5 foo } c
+  c-\markup {
+    \override #'(thickness . 2)
+    \whiteout foo
+  }
+  c
+  c-\markup {
+    \override #'(thickness . 3)
+    \override #'(whiteout-style . outline)
+    \whiteout foo
+  }
+  c
 }