(spanned_rank_iv): Bugfix.

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index d5341c4c55cc98acc1bfe1aa22838b008b2fe24c..058cc2f0ba4bd0fe19cb910737c1e917a1a0c236 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -37,7 +37,7 @@ Spanner::do_break_processing ()
     {
       if (Spanner* parent = dynamic_cast<Spanner*> (get_parent ((Axis)a)))
        {
-         if (!parent->spanned_rank_iv ().contains_b (this->spanned_rank_iv ()))
+         if (!parent->spanned_rank_iv ().superset (this->spanned_rank_iv ()))
            {
              programming_error (to_string ("Spanner `%s' is not fully contained in parent spanner `%s'.",
                                         name ().to_str0 (),
@@ -119,12 +119,12 @@ Spanner::do_break_processing ()
        }
     }
   broken_intos_.sort (Spanner::compare);
-  for (int i= broken_intos_.size();i--;)
+  for (int i= broken_intos_.size ();i--;)
     broken_intos_[i]->break_index_ = i;
 }
 
 int
-Spanner::get_break_index ()const
+Spanner::get_break_index () const
 {
   return break_index_;
 }
@@ -146,14 +146,10 @@ Spanner::spanned_rank_iv ()
 {
   Interval_t<int> iv (0, 0);
 
-  if (spanned_drul_[LEFT])
-    {
-      iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
-    }
-  if (spanned_drul_[RIGHT])
-    {
-      iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
-    }
+  if (spanned_drul_[LEFT] && spanned_drul_[LEFT]->get_column ())
+    iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
+  if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ())
+    iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
   return iv;
 }
 
@@ -341,7 +337,7 @@ Spanner::set_spacing_rods (SCM smob)
   r.item_l_drul_[LEFT] = sp->get_bound (LEFT);
   r.item_l_drul_[RIGHT] = sp->get_bound (RIGHT);
   r.distance_ =
-    robust_scm2double (me->get_grob_property ("minimum-length"), 0);
+    robust_scm2double (me->get_property ("minimum-length"), 0);
 
   r.add_to_cols ();
   return SCM_UNSPECIFIED;
@@ -365,7 +361,7 @@ unsmob_spanner (SCM s )
   return dynamic_cast<Spanner*> (unsmob_grob (s));
 }
 
-ADD_INTERFACE(Spanner,
+ADD_INTERFACE (Spanner,
              "spanner-interface",
 "Some objects are horizontally spanned between objects. For\n"
 "example, slur, beam, tie, etc. These grobs form a subtype called\n"