Merge branch 'stable-2.10' of /home/lilydev/vc/gub/downloads/lilypond into master...

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index f8726a864709386c9efdea83193d554150e4ebbd..955ba76ef3ad08b0b3bfe032f02385c17c8dab98 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -124,7 +124,7 @@ Spanner::do_break_processing ()
            }
        }
     }
-  vector_sort (broken_intos_, Spanner::compare);
+  vector_sort (broken_intos_, Spanner::less);
   for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
@@ -238,12 +238,27 @@ Spanner::get_system () const
 Grob *
 Spanner::find_broken_piece (System *l) const
 {
-  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less_than);
+  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less);
   if (idx != VPOS)
     return broken_intos_ [idx];
   return 0;
 }
 
+Spanner *
+Spanner::broken_neighbor (Direction d) const
+{
+  if (!original_)
+    return 0;
+
+  vsize k = broken_spanner_index (this);
+  Spanner *orig = dynamic_cast<Spanner*> (original_);
+  int j = int (k) + d;
+  if (j < 0 || vsize (j) >= orig->broken_intos_.size ())
+    return 0;
+
+  return orig->broken_intos_[j];
+}
+
 int
 Spanner::compare (Spanner *const &p1, Spanner *const &p2)
 {
@@ -251,7 +266,7 @@ Spanner::compare (Spanner *const &p1, Spanner *const &p2)
 }
 
 bool
-Spanner::less_than (Spanner *const &a, Spanner *const &b)
+Spanner::less (Spanner *const &a, Spanner *const &b)
 {
   return a->get_system ()->get_rank () < b->get_system ()->get_rank ();
 }
@@ -342,10 +357,11 @@ Spanner::set_spacing_rods (SCM smob)
   Return I such that SP == SP->ORIGINAL ()->BROKEN_INTOS_[I].
 */
 int
-broken_spanner_index (Spanner *sp)
+broken_spanner_index (Spanner const *sp)
 {
   Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
-  return find (parent->broken_intos_, sp) - parent->broken_intos_.begin ();
+  /* ugh: casting */
+  return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *
@@ -362,3 +378,4 @@ ADD_INTERFACE (Spanner,
               "@code{Item} objects), one on the left and one on the right. The left bound is\n"
               "also the X-reference point of the spanner.\n",
               "minimum-length");
+