X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=a76ed9b2fa0f930c1b525a0eeab2b290929c083a;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=695cc59293f4fc8b16c6bddf21a369a9d274cbd3;hpb=f93e4199873c91ae32f0e84a610d14853dc379df;p=lilypond.git

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 695cc59293..a76ed9b2fa 100644
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2003--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2003--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 
 #include "lyric-hyphen.hh"
 
+#include "axis-group-interface.hh"
 #include "lookup.hh"
 #include "output-def.hh"
 #include "paper-column.hh"
@@ -34,7 +35,7 @@ MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
 SCM
 Lyric_hyphen::print (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = unsmob<Spanner> (smob);
   Drul_array<Item *> bounds (me->get_bound (LEFT),
                              me->get_bound (RIGHT));
 
@@ -46,17 +47,14 @@ Lyric_hyphen::print (SCM smob)
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
 
   Interval span_points;
-  Direction d = LEFT;
-  Drul_array<bool> broken;
-  do
+  for (LEFT_and_RIGHT (d))
     {
-      Interval iv = bounds[d]->extent (common, X_AXIS);
+      Interval iv = Axis_group_interface::generic_bound_extent (bounds[d], common, X_AXIS);
 
       span_points[d] = iv.is_empty ()
                        ? bounds[d]->relative_coordinate (common, X_AXIS)
                        : iv[-d];
     }
-  while (flip (&d) != LEFT);
 
   Real lt = me->layout ()->get_dimension (ly_symbol2scm ("line-thickness"));
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt;
@@ -69,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;
@@ -105,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);
@@ -117,20 +128,18 @@ MAKE_SCHEME_CALLBACK (Lyric_hyphen, set_spacing_rods, 1);
 SCM
 Lyric_hyphen::set_spacing_rods (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = unsmob<Grob> (smob);
 
   Rod r;
   Spanner *sp = dynamic_cast<Spanner *> (me);
 
   r.distance_ = robust_scm2double (me->get_property ("minimum-distance"), 0);
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
       r.item_drul_[d] = sp->get_bound (d);
       if (r.item_drul_[d])
         r.distance_ += -d * r.item_drul_[d]->extent (r.item_drul_[d], X_AXIS)[-d];
     }
-  while (flip (&d) != LEFT);
 
   if (r.item_drul_[LEFT]
       && r.item_drul_[RIGHT])
@@ -152,4 +161,3 @@ ADD_INTERFACE (Lyric_hyphen,
                "padding "
                "thickness "
               );
-