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 e1fe55efe1d04d6ee65ea6e0ce80ad5f9b94bbbd..f507be680a77e29097fc57eed6179366b9a4dc51 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -14,6 +14,7 @@
 #include "stencil.hh"
 #include "system.hh"
 #include "warn.hh"
+#include "moment.hh"
 
 Grob *
 Spanner::clone () const
@@ -39,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 (),
@@ -145,7 +146,7 @@ Spanner::set_my_columns ()
 }
 
 Interval_t<int>
-Spanner::spanned_rank_iv ()
+Spanner::spanned_rank_interval () const
 {
   Interval_t<int> iv (0, 0);
 
@@ -156,6 +157,14 @@ Spanner::spanned_rank_iv ()
   return iv;
 }
 
+Interval_t<Moment>
+Spanner::spanned_time () const
+{
+  return spanned_time_interval (spanned_drul_[LEFT],
+                               spanned_drul_[RIGHT]);
+}
+
+
 Item *
 Spanner::get_bound (Direction d) const
 {
@@ -384,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)
 {