#include "warn.hh"
#include "lily-imports.hh"
-using std::set;
-using std::string;
-using std::vector;
Grob *
Grob::clone () 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<Stencil>
(Lily::stencil_whiteout (retval.smobbed_copy (),
- scm_from_double (thickness)));
- }
-
- /* Calls the scheme procedure stencil-whiteout-box in scm/stencils.scm */
- if (!transparent && (scm_is_number (get_property("whiteout-box"))
- || to_boolean (get_property ("whiteout-box"))))
- {
- Real thickness = robust_scm2double (get_property("whiteout-box"), 0.0)
- * layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
- retval = *unsmob<Stencil>
- (Lily::stencil_whiteout_box (retval.smobbed_copy (),
- scm_from_double (thickness)));
+ get_property ("whiteout-style"),
+ get_property ("whiteout"),
+ scm_from_double (line_thickness)));
}
if (transparent)
"transparent "
"vertical-skylines "
"whiteout "
- "whiteout-box "
+ "whiteout-style "
);
/****************************************************************