Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index e80f1efce32df6435036b87cf20e0ca98ff85720..bb6f743a24d5034eab9a0e6cb76805b11308a071 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -81,7 +81,7 @@ Spanner::do_break_processing ()
   else
     {
       System *root  = get_root_system (this);
-      Link_array<Item> break_points = root->broken_col_range (left, right);
+      vector<Item*> break_points = root->broken_col_range (left, right);
 
       break_points.insert (break_points.begin () + 0, left);
       break_points.push_back (right);
@@ -124,12 +124,12 @@ Spanner::do_break_processing ()
            }
        }
     }
-  broken_intos_.sort (Spanner::compare);
-  for (vsize i = broken_intos_.size ();i--;)
+  vector_sort (broken_intos_, Spanner::compare);
+  for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
 
-int
+vsize
 Spanner::get_break_index () const
 {
   return break_index_;
@@ -238,12 +238,10 @@ Spanner::get_system () const
 Grob *
 Spanner::find_broken_piece (System *l) const
 {
-  int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare);
-
-  if (idx < 0)
-    return 0;
-  else
+  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::compare);
+  if (idx != VPOS)
     return broken_intos_ [idx];
+  return 0;
 }
 
 int
@@ -337,7 +335,7 @@ int
 broken_spanner_index (Spanner *sp)
 {
   Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
-  return parent->broken_intos_.find_index (sp);
+  return find (parent->broken_intos_, sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *