Merge remote-tracking branch 'origin/translation' into staging

[lilypond.git] / lily / line-spanner.cc

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index f42628820e6e64b6a0ba019d93f0bf8666125472..2c7cfdda1d5d12fd92a29cccfefd8b751b559498 100644 (file)
--- 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--2014 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"
@@ -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 = unsmob_grob (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);
         }
 
@@ -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)));