X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob.cc;h=7ce89d50158ff737e2e702609c1f7750422b84d6;hb=ec91a9a4bdd186d7af88381a10a2923ac949d33c;hp=f7bf31f2868db17937bfa33d1a64b4d35d2c9602;hpb=8920247a80a350aaab540166ab7a4937f45786a6;p=lilypond.git diff --git a/lily/grob.cc b/lily/grob.cc index f7bf31f286..7ce89d5015 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -146,21 +146,15 @@ Grob::get_print_stencil () const /* whiteout background and larger file sizes with \pointAndClickOn. */ /* A grob has to be visible, otherwise the whiteout property has no effect. */ /* Calls the scheme procedure stencil-whiteout in scm/stencils.scm */ - if (!transparent && (scm_is_number (get_property("whiteout")) + if (!transparent && (scm_is_number (get_property ("whiteout")) || to_boolean (get_property ("whiteout")))) { - Real thickness = robust_scm2double (get_property("whiteout"), 3.0) - * layout ()->get_dimension (ly_symbol2scm ("line-thickness")); + Real line_thickness = layout ()->get_dimension (ly_symbol2scm ("line-thickness")); retval = *unsmob (Lily::stencil_whiteout (retval.smobbed_copy (), - scm_from_double (thickness))); - } - - /* Calls the scheme procedure stencil-whiteout-box in scm/stencils.scm */ - if (!transparent && to_boolean (get_property ("whiteout-box"))) - { - retval = *unsmob - (Lily::stencil_whiteout_box (retval.smobbed_copy ())); + get_property ("whiteout-style"), + get_property ("whiteout"), + scm_from_double (line_thickness))); } if (transparent) @@ -839,7 +833,7 @@ ADD_INTERFACE (Grob, "transparent " "vertical-skylines " "whiteout " - "whiteout-box " + "whiteout-style " ); /****************************************************************