* lily/melody-engraver.cc (acknowledge_stem): restart MelodyItem

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 05f1443e78135e41d0cdc956e97b9889e5e7d139..8db59844f85a4926162661577778370563049d7d 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -3,14 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "spanner.hh"
 
-#include <math.h>
 
-#include "group-interface.hh"
+#include "pointer-group-interface.hh"
 #include "libc-extension.hh"
 #include "paper-column.hh"
 #include "paper-column.hh"
@@ -81,7 +80,8 @@ Spanner::do_break_processing ()
     }
   else
     {
-      Link_array<Item> break_points = pscore_->system_->broken_col_range (left, right);
+      System *root  = get_root_system (this);
+      Link_array<Item> break_points = root->broken_col_range (left, right);
 
       break_points.insert (left, 0);
       break_points.push (right);
@@ -153,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;
 }
 
@@ -185,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
@@ -198,9 +196,7 @@ 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)
@@ -209,8 +205,6 @@ Spanner::Spanner (SCM s, Object_key const *key)
   break_index_ = 0;
   spanned_drul_[LEFT] = 0;
   spanned_drul_[RIGHT] = 0;
-
-  Group_interface::add_thing (this, ly_symbol2scm ("interfaces"), ly_symbol2scm ("spanner-interface"));
 }
 
 Spanner::Spanner (Spanner const &s, int count)
@@ -255,7 +249,7 @@ Spanner::find_broken_piece (System *l) const
 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
@@ -290,14 +284,9 @@ 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])
@@ -307,8 +296,6 @@ Spanner::do_derived_mark () const
 
   for (int i = broken_intos_.size (); i--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
-
-  return SCM_EOL;
 }
 
 /*
@@ -344,12 +331,12 @@ 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_);
+  Spanner *parent = dynamic_cast<Spanner *> (sp->original ());
   return parent->broken_intos_.find_index (sp);
 }