X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=a76ed9b2fa0f930c1b525a0eeab2b290929c083a;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=029391f92f681fbe3e144efa7c66444c0da20fd4;hpb=958e95822083954cad00e0a598eb9f12ceba67b9;p=lilypond.git diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 029391f92f..a76ed9b2fa 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -67,6 +67,7 @@ Lyric_hyphen::print (SCM smob) Real dash_period = robust_scm2double (me->get_property ("dash-period"), 1.0); Real dash_length = robust_scm2double (me->get_property ("length"), .5); Real padding = robust_scm2double (me->get_property ("padding"), 0.1); + Real whiteout = robust_scm2double (me->get_property ("whiteout"), -1); if (dash_period < dash_length) dash_period = 1.5 * dash_length; @@ -103,8 +104,20 @@ Lyric_hyphen::print (SCM smob) for (int i = 0; i < n; i++) { Stencil m (dash_mol); - m.translate_axis (span_points[LEFT] + i * dash_period + space_left / 2, X_AXIS); + m = m.in_color (0.0, 0.0, 0.0); + m.translate_axis (span_points[LEFT] + i * dash_period + + space_left / 2, X_AXIS); total.add_stencil (m); + if (whiteout > 0.0 ) + { + Box c (Interval (0, dash_length + 2 * whiteout * lt), + Interval (h - whiteout * lt, h + th + whiteout * lt)); + Stencil w (Lookup::round_filled_box (c, 0.8 * lt)); + w = w.in_color (1.0, 1.0, 1.0); + w.translate_axis (span_points[LEFT] + i * dash_period + + space_left / 2 - whiteout * lt, X_AXIS); + total.add_stencil (w); + } } total.translate_axis (-me->relative_coordinate (common, X_AXIS), X_AXIS); @@ -148,4 +161,3 @@ ADD_INTERFACE (Lyric_hyphen, "padding " "thickness " ); -