use classnames for interface naming; remove inclusion of

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 182a2a818c27b15d11c537313e3dc0832fa3abd6..1e49d0b0c9005c79f7fe40fc6ae107982e4f1f39 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spanner.hh"
@@ -45,8 +45,8 @@ Spanner::do_break_processing ()
          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 (),
-                                           parent->name ().to_str0 ()));
+                                           name ().c_str (),
+                                           parent->name ().c_str ()));
            }
        }
     }
@@ -73,19 +73,20 @@ Spanner::do_break_processing ()
 
              assert (span->get_system ());
              span->get_system ()->typeset_grob (span);
-             broken_intos_.push (span);
+             broken_intos_.push_back (span);
            }
        }
       while ((flip (&d)) != LEFT);
     }
   else
     {
-      Link_array<Item> break_points = pscore_->root_system ()->broken_col_range (left, right);
+      System *root  = get_root_system (this);
+      vector<Item*> break_points = root->broken_col_range (left, right);
 
-      break_points.insert (left, 0);
-      break_points.push (right);
+      break_points.insert (break_points.begin () + 0, left);
+      break_points.push_back (right);
 
-      for (int i = 1; i < break_points.size (); i++)
+      for (vsize i = 1; i < break_points.size (); i++)
        {
          Drul_array<Item *> bounds;
          bounds[LEFT] = break_points[i - 1];
@@ -119,16 +120,16 @@ Spanner::do_break_processing ()
          else
            {
              bounds[LEFT]->get_system ()->typeset_grob (span);
-             broken_intos_.push (span);
+             broken_intos_.push_back (span);
            }
        }
     }
-  broken_intos_.sort (Spanner::compare);
-  for (int i = broken_intos_.size ();i--;)
+  vector_sort (broken_intos_, Spanner::less);
+  for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
 
-int
+vsize
 Spanner::get_break_index () const
 {
   return break_index_;
@@ -237,12 +238,25 @@ Spanner::get_system () const
 Grob *
 Spanner::find_broken_piece (System *l) const
 {
-  int idx = binsearch_links (broken_intos_, (Spanner *)l, Spanner::compare);
+  vsize idx = binary_search (broken_intos_, (Spanner *)l, Spanner::less);
+  if (idx != VPOS)
+    return broken_intos_ [idx];
+  return 0;
+}
 
-  if (idx < 0)
+Spanner *
+Spanner::broken_neighbor (Direction d) const
+{
+  if (!original_)
     return 0;
-  else
-    return broken_intos_ [idx];
+
+  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
@@ -251,6 +265,12 @@ Spanner::compare (Spanner *const &p1, Spanner *const &p2)
   return p1->get_system ()->get_rank () - p2->get_system ()->get_rank ();
 }
 
+bool
+Spanner::less (Spanner *const &a, Spanner *const &b)
+{
+  return a->get_system ()->get_rank () < b->get_system ()->get_rank ();
+}
+
 bool
 Spanner::is_broken () const
 {
@@ -293,7 +313,7 @@ Spanner::derived_mark () const
   while (flip (&d) != LEFT)
     ;
 
-  for (int i = broken_intos_.size (); i--;)
+  for (vsize i = broken_intos_.size (); i--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
 }
 
@@ -322,21 +342,26 @@ Spanner::set_spacing_rods (SCM smob)
   Spanner *sp = dynamic_cast<Spanner *> (me);
   r.item_drul_[LEFT] = sp->get_bound (LEFT);
   r.item_drul_[RIGHT] = sp->get_bound (RIGHT);
-  r.distance_
-    = robust_scm2double (me->get_property ("minimum-length"), 0);
 
-  r.add_to_cols ();
+  SCM num_length = me->get_property ("minimum-length");
+  if (scm_is_number (num_length))
+    {
+      r.distance_ = robust_scm2double (num_length, 0);
+      r.add_to_cols ();
+    }
+  
   return SCM_UNSPECIFIED;
 }
 
 /*
-  Return I such that SP == SP->ORIGINAL_->BROKEN_INTOS_[I].
+  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 parent->broken_intos_.find_index (sp);
+  Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
+  /* ugh: casting */
+  return find (parent->broken_intos_, (Spanner*) sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *
@@ -346,10 +371,10 @@ unsmob_spanner (SCM s)
 }
 
 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"
               "@code{Spanner}. All spanners have two span-points (these must be\n"
               "@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");
+