Run grand replace for 2015.

[lilypond.git] / lily / lyric-hyphen.cc

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 4ce2fddeb86724b23b2da75f03fd482b8b357253..b8afd7718c4ee3e194155488f4bd87291f82d5ea 100644 (file)
--- 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--2012 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
@@ -35,7 +35,7 @@ MAKE_SCHEME_CALLBACK (Lyric_hyphen, print, 1);
 SCM
 Lyric_hyphen::print (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
   Drul_array<Item *> bounds (me->get_bound (LEFT),
                              me->get_bound (RIGHT));
 
@@ -47,18 +47,14 @@ Lyric_hyphen::print (SCM smob)
   Grob *common = bounds[LEFT]->common_refpoint (bounds[RIGHT], X_AXIS);
 
   Interval span_points;
-  Direction d = LEFT;
-  do
+  for (LEFT_and_RIGHT (d))
     {
-      Interval iv = bounds[d]->break_status_dir ()
-                    ? Axis_group_interface::generic_bound_extent (bounds[d], common, X_AXIS)
-                    : robust_relative_extent (bounds[d], 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;
@@ -119,20 +115,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 = Grob::unsmob (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])