From c5c06029fc0b17266d36b40255c631ac1d31a370 Mon Sep 17 00:00:00 2001
From: Paul Morris <paulwmorris@gmail.com>
Date: Wed, 10 Jun 2015 01:11:56 -0400
Subject: [PATCH] Issue 4418/5 whiteout -> whiteout-box in scm/

---
 scm/bar-line.scm     | 4 ++--
 scm/define-grobs.scm | 2 +-
 scm/output-lib.scm   | 4 ++--
 scm/stencil.scm      | 4 ++--
 scm/tablature.scm    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scm/bar-line.scm b/scm/bar-line.scm
index 02c80f64e5..296d86787a 100644
--- a/scm/bar-line.scm
+++ b/scm/bar-line.scm
@@ -467,11 +467,11 @@ draws the span bar variant, i.e. without the segno sign."
 (define (make-kievan-bar-line grob extent)
   "Draw a kievan bar line."
   (let* ((font (ly:grob-default-font grob))
-         (stencil (stencil-whiteout
+         (stencil (stencil-whiteout-box
                    (ly:font-get-glyph font "scripts.barline.kievan"))))
 
     ;; the kievan bar line has no staff lines underneath,
-    ;; so we whiteout them and move the grob to a higher layer
+    ;; so we whiteout-box them and move the grob to a higher layer
     (ly:grob-set-property! grob 'layer 1)
     stencil))
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index cdae45dd17..f91ad54025 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2361,7 +2361,7 @@
         (parenthesis-friends . (dot))
         (stem-attachment . (0.0 . 1.35))
         (stencil . ,tab-note-head::print)
-        (whiteout . #t)
+        (whiteout-box . #t)
         (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
         (Y-offset . ,staff-symbol-referencer::callback)
         (Y-extent . ,grob::always-Y-extent-from-stencil)
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 33ad81ae50..8a5cae2b23 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -902,8 +902,8 @@ and duration-log @var{log}."
     (set! rp (ly:make-stencil (ly:stencil-expr rp)
                               rp-x-extent
                               (ly:stencil-extent rp Y)))
-    (list (stencil-whiteout lp)
-          (stencil-whiteout rp))))
+    (list (stencil-whiteout-box lp)
+          (stencil-whiteout-box rp))))
 
 (define-public (parentheses-item::y-extent grob) (ly:grob::stencil-height grob))
 
diff --git a/scm/stencil.scm b/scm/stencil.scm
index 75efde39d9..e64cc2b91c 100644
--- a/scm/stencil.scm
+++ b/scm/stencil.scm
@@ -836,10 +836,10 @@ with optional arrows of @code{max-size} on start and end controlled by
                           (make-simple-markup (simple-format #f "~a: NaN/inf" name))))
         (let ((text-stencil (interpret-markup
                              layout text-props
-                             (markup #:whiteout #:simple name)))
+                             (markup #:whiteout-box #:simple name)))
               (dim-stencil (interpret-markup
                             layout text-props
-                            (markup #:whiteout
+                            (markup #:whiteout-box
                                     #:simple (cond
                                               ((interval-empty? extent)
                                                "empty")
diff --git a/scm/tablature.scm b/scm/tablature.scm
index 2864c5d4b0..87e5b300af 100644
--- a/scm/tablature.scm
+++ b/scm/tablature.scm
@@ -33,7 +33,7 @@
   (let ((style (ly:grob-property grob 'style)))
 
     (case style
-      ((cross slash) (stencil-whiteout (ly:note-head::print grob)))
+      ((cross slash) (stencil-whiteout-box (ly:note-head::print grob)))
       (else (tab-note-head::print grob)))))
 
 ;; definitions for the "moderntab" clef:
-- 
2.39.5