X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fline-spanner.cc;h=6921ba058ec8e8d440218b4babf076773be0585a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f42628820e6e64b6a0ba019d93f0bf8666125472;hpb=05b3ddf4bb419c41da16b4be853d823ee0d3a0ec;p=lilypond.git

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index f42628820e..6921ba058e 100644
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2000--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@
 #include "axis-group-interface.hh"
 #include "font-interface.hh"
 #include "grob-interface.hh"
-#include "international.hh"
 #include "item.hh"
 #include "lily-proto.hh"
 #include "line-interface.hh"
@@ -57,7 +56,7 @@ Spanner *parent_spanner (Grob *g)
 SCM
 Line_spanner::calc_bound_info (SCM smob, Direction dir)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
 
   Grob *commonx = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
   commonx = me->common_refpoint (commonx, X_AXIS);
@@ -115,7 +114,7 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
                       ? Axis_group_interface::generic_bound_extent (bound_grob, commonx, X_AXIS)
                       : robust_relative_extent (bound_grob, commonx, X_AXIS)).linear_combination (attach);
 
-      Grob *acc = Note_column::accidentals (bound_grob->get_parent (X_AXIS));
+      Grob *acc = Grob::unsmob (bound_grob->get_object ("accidental-grob"));
       if (acc && to_boolean (ly_assoc_get (ly_symbol2scm ("end-on-accidental"), details, SCM_BOOL_F)))
         x_coord = robust_relative_extent (acc, commonx, X_AXIS).linear_combination (attach);
 
@@ -190,7 +189,9 @@ Line_spanner::calc_bound_info (SCM smob, Direction dir)
         }
       else
         {
-          y = me->get_bound (dir)->extent (common_y, Y_AXIS).center ();
+          Interval ii = me->get_bound (dir)->extent (common_y, Y_AXIS);
+          if (!ii.is_empty())
+            y = ii.center ();
           details = scm_acons (ly_symbol2scm ("common-Y"), common_y->self_scm (), details);
         }
 
@@ -205,7 +206,7 @@ MAKE_SCHEME_CALLBACK (Line_spanner, calc_cross_staff, 1);
 SCM
 Line_spanner::calc_cross_staff (SCM smob)
 {
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
   if (!me)
     return SCM_BOOL_F;
 
@@ -236,7 +237,7 @@ SCM
 Line_spanner::calc_left_bound_info_and_text (SCM smob)
 {
   SCM alist = Line_spanner::calc_bound_info (smob, LEFT);
-  Spanner *me = unsmob_spanner (smob);
+  Spanner *me = Spanner::unsmob (smob);
 
   SCM text = me->get_property ("text");
   if (Text_interface::is_markup (text)
@@ -258,7 +259,7 @@ MAKE_SCHEME_CALLBACK (Line_spanner, print, 1);
 SCM
 Line_spanner::print (SCM smob)
 {
-  Spanner *me = dynamic_cast<Spanner *> (unsmob_grob (smob));
+  Spanner *me = dynamic_cast<Spanner *> (Grob::unsmob (smob));
 
   // Triggers simple-Y calculations
   bool simple_y = to_boolean (me->get_property ("simple-Y")) && !to_boolean (me->get_property ("cross-staff"));
@@ -296,9 +297,9 @@ Line_spanner::print (SCM smob)
                                                  bounds[d], SCM_BOOL_F), 0.0);
       arrows[d] = to_boolean (ly_assoc_get (ly_symbol2scm ("arrow"),
                                             bounds[d], SCM_BOOL_F));
-      stencils[d] = unsmob_stencil (ly_assoc_get (ly_symbol2scm ("stencil"),
+      stencils[d] = Stencil::unsmob (ly_assoc_get (ly_symbol2scm ("stencil"),
                                                   bounds[d], SCM_BOOL_F));
-      common_y[d] = unsmob_grob (ly_assoc_get (ly_symbol2scm ("common-Y"),
+      common_y[d] = Grob::unsmob (ly_assoc_get (ly_symbol2scm ("common-Y"),
                                                bounds[d], SCM_BOOL_F));
       if (!common_y[d])
         common_y[d] = me;
@@ -356,9 +357,9 @@ Line_spanner::print (SCM smob)
     }
 
   Offset adjust = dz.direction () * Staff_symbol_referencer::staff_space (me);
-
   Offset line_left = span_points[LEFT] + (arrows[LEFT] ? adjust * 1.4 : Offset (0, 0));
   Offset line_right = span_points[RIGHT] - (arrows[RIGHT] ? adjust * 0.55 : Offset (0, 0));
+
   if (line_right[X_AXIS] > line_left[X_AXIS])
     {
       line.add_stencil (Line_interface::line (me, line_left, line_right));
@@ -369,8 +370,6 @@ Line_spanner::print (SCM smob)
                                                 arrows[LEFT],
                                                 arrows[RIGHT]));
     }
-  else
-    me->warning (_ ("Line spanner's left point is to the right of its right point."));
 
   line.translate (Offset (-me->relative_coordinate (commonx, X_AXIS),
                           simple_y ? 0.0 : -me->relative_coordinate (my_common_y, Y_AXIS)));