Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 8a1e9e62c96204d71a9b6fd5c55c41466f505327..f507be680a77e29097fc57eed6179366b9a4dc51 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -40,7 +40,7 @@ Spanner::do_break_processing ()
     {
       if (Spanner *parent = dynamic_cast<Spanner *> (get_parent ((Axis)a)))
        {
-         if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
+         if (!parent->spanned_rank_interval ().superset (this->spanned_rank_interval ()))
            {
              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
                                            name ().c_str (),
@@ -146,7 +146,7 @@ Spanner::set_my_columns ()
 }
 
 Interval_t<int>
-Spanner::spanned_rank_iv () const
+Spanner::spanned_rank_interval () const
 {
   Interval_t<int> iv (0, 0);
 
@@ -160,28 +160,11 @@ Spanner::spanned_rank_iv () const
 Interval_t<Moment>
 Spanner::spanned_time () const
 {
-  Interval_t<Moment> iv;
-
-  Direction d = LEFT;
-  do
-    {
-      if (spanned_drul_[d] && spanned_drul_[d]->get_column ())
-       iv[d] = robust_scm2moment (spanned_drul_[d]->get_column ()->get_property ("when"),
-                                 iv[d]);
-    }
-  while (flip (&d) != LEFT);
-
-  do
-    {
-      if (!spanned_drul_[d] || !spanned_drul_[d]->get_column ())
-       iv[d] = iv[-d];
-    }
-  while (flip (&d) != LEFT);
-  
-  
-  return iv;
+  return spanned_time_interval (spanned_drul_[LEFT],
+                               spanned_drul_[RIGHT]);
 }
 
+
 Item *
 Spanner::get_bound (Direction d) const
 {
@@ -410,7 +393,7 @@ unsmob_spanner (SCM s)
   return dynamic_cast<Spanner *> (unsmob_grob (s));
 }
 
-MAKE_SCHEME_CALLBACK(Spanner, bounds_width, 1);
+MAKE_SCHEME_CALLBACK (Spanner, bounds_width, 1);
 SCM
 Spanner::bounds_width (SCM grob)
 {