X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-hyphen.cc;h=b8afd7718c4ee3e194155488f4bd87291f82d5ea;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=21ec770ea13d43c2a2f5ccba4ee6491f1f785a74;hpb=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 21ec770ea1..b8afd7718c 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--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));
 
@@ -49,9 +49,7 @@ Lyric_hyphen::print (SCM smob)
   Interval span_points;
   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)
@@ -117,7 +115,7 @@ 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);