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 0a72592b3218c6917758d3637bb72179916ea794..bb6f743a24d5034eab9a0e6cb76805b11308a071 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,22 +3,20 @@
 
   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"
 
-#include <math.h>
 
-#include <libc - extension.hh>
-
-#include "warn.hh"
+#include "pointer-group-interface.hh"
+#include "libc-extension.hh"
+#include "paper-column.hh"
 #include "paper-column.hh"
 #include "paper-score.hh"
 #include "stencil.hh"
-#include "paper-column.hh"
 #include "system.hh"
-#include "group-interface.hh"
+#include "warn.hh"
 
 Grob *
 Spanner::clone (int count) const
@@ -47,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 ()));
            }
        }
     }
@@ -75,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);
+      while ((flip (&d)) != LEFT);
     }
   else
     {
-      Link_array<Item> break_points = pscore_->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];
@@ -98,7 +97,7 @@ Spanner::do_break_processing ()
              if (!bounds[d]->get_system ())
                bounds[d] = bounds[d]->find_prebroken_piece (- d);
            }
-         while ((flip (&d))!= LEFT);
+         while ((flip (&d)) != LEFT);
 
          if (!bounds[LEFT] || ! bounds[RIGHT])
            {
@@ -121,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::compare);
+  for (vsize i = broken_intos_.size (); i--;)
     broken_intos_[i]->break_index_ = i;
 }
 
-int
+vsize
 Spanner::get_break_index () const
 {
   return break_index_;
@@ -154,9 +153,9 @@ Spanner::spanned_rank_iv ()
   Interval_t<int> iv (0, 0);
 
   if (spanned_drul_[LEFT] && spanned_drul_[LEFT]->get_column ())
-    iv[LEFT] = Paper_column::get_rank (spanned_drul_[LEFT]->get_column ());
+    iv[LEFT] = spanned_drul_[LEFT]->get_column ()->get_rank ();
   if (spanned_drul_[RIGHT] && spanned_drul_[RIGHT]->get_column ())
-    iv[RIGHT] = Paper_column::get_rank (spanned_drul_[RIGHT]->get_column ());
+    iv[RIGHT] = spanned_drul_[RIGHT]->get_column ()->get_rank ();
   return iv;
 }
 
@@ -176,7 +175,7 @@ Spanner::set_bound (Direction d, Grob *s)
   Item *i = dynamic_cast<Item *> (s);
   if (!i)
     {
-      programming_error ("Must have Item for spanner bound.");
+      programming_error ("must have Item for spanner bound");
       return;
     }
 
@@ -186,9 +185,7 @@ Spanner::set_bound (Direction d, Grob *s)
      We check for System to prevent the column -> line_of_score
      -> column -> line_of_score -> etc situation */
   if (d == LEFT && !dynamic_cast<System *> (this))
-    {
-      set_parent (i, X_AXIS);
-    }
+    set_parent (i, X_AXIS);
 
   /*
     Signal that this column needs to be kept alive. They need to be
@@ -199,19 +196,15 @@ Spanner::set_bound (Direction d, Grob *s)
 
   */
   if (dynamic_cast<Paper_column *> (i))
-    {
-      Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
-    }
+    Pointer_group_interface::add_grob (i, ly_symbol2scm ("bounded-by-me"), this);
 }
 
 Spanner::Spanner (SCM s, Object_key const *key)
   : Grob (s, key)
 {
   break_index_ = 0;
-  spanned_drul_[LEFT]= 0;
-  spanned_drul_[RIGHT]= 0;
-
-  Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface"));
+  spanned_drul_[LEFT] = 0;
+  spanned_drul_[RIGHT] = 0;
 }
 
 Spanner::Spanner (Spanner const &s, int count)
@@ -226,7 +219,7 @@ Spanner::spanner_length () const
   Real l = spanned_drul_[LEFT]->relative_coordinate (0, X_AXIS);
   Real r = spanned_drul_[RIGHT]->relative_coordinate (0, X_AXIS);
 
-  if (r< l)
+  if (r < l)
     programming_error ("spanner with negative length");
 
   return r - l;
@@ -245,18 +238,16 @@ 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
 Spanner::compare (Spanner *const &p1, Spanner *const &p2)
 {
-  return p1->get_system ()->rank_ - p2->get_system ()->rank_;
+  return p1->get_system ()->get_rank () - p2->get_system ()->get_rank ();
 }
 
 bool
@@ -291,24 +282,18 @@ Spanner::get_broken_left_end_align () const
   return 0.0;
 }
 
-SCM
-Spanner::do_derived_mark () const
+void
+Spanner::derived_mark () const
 {
-  /*
-    We'd be fucked if this is called before spanned_drul_[] is inited.  */
-  if (status_ == ORPHAN)
-    return SCM_EOL;
-
   Direction d = LEFT;
   do
     if (spanned_drul_[d])
       scm_gc_mark (spanned_drul_[d]->self_scm ());
-  while (flip (&d) != LEFT);
+  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 ());
-
-  return SCM_EOL;
 }
 
 /*
@@ -344,13 +329,13 @@ Spanner::set_spacing_rods (SCM smob)
 }
 
 /*
-  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)
 {
-  Spanner *parent = dynamic_cast<Spanner *> (sp->original_);
-  return parent->broken_intos_.find_index (sp);
+  Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
+  return find (parent->broken_intos_, sp) - parent->broken_intos_.begin ();
 }
 
 Spanner *