release: 1.3.70

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index c384224889c36aa47e621ca2d3c2db55ef11c84e..f9cb12f4c1ae7dbaddf0329cfa4c1fb777aafa0a 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -6,8 +6,9 @@
   (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include <math.h>
+#include <libc-extension.hh>
+
 
-#include "dimension-cache.hh"
 #include "debug.hh"
 #include "spanner.hh"
 #include "paper-column.hh"
@@ -29,12 +30,6 @@ Spanner::do_break_processing ()
   if (!left || !right)
     return;
   
-  if  (left == right)
-    {
-      warning (_f ("Spanner `%s' has equal left and right spanpoints",
-                  classname (this)));
-    }
-
   /*
     Check if our parent in X-direction spans equally wide
     or wider than we do.
@@ -57,9 +52,6 @@ Spanner::do_break_processing ()
 
   if  (left == right)
     {
-      /*
-       FIXME: this is broken.
-       */
       /*
        If we have a spanner spanning one column, we must break it
        anyway because it might provide a parent for another item.  */
@@ -67,7 +59,9 @@ Spanner::do_break_processing ()
       do
        {
          Item* bound = left->find_prebroken_piece (d);
-         if (bound->line_l ())
+         if (!bound)
+           programming_error ("no broken bound");
+         else if (bound->line_l ())
            {
              Spanner * span_p = dynamic_cast<Spanner*>( clone ());
              span_p->set_bound (LEFT, bound);
@@ -140,11 +134,11 @@ Spanner::spanned_rank_iv ()
 
   if (spanned_drul_[LEFT])
     {
-      iv[LEFT] = spanned_drul_[LEFT]->column_l ()->rank_i ();
+      iv[LEFT] = Paper_column::rank_i (spanned_drul_[LEFT]->column_l ());
     }
-  if ( spanned_drul_[RIGHT])
+  if (spanned_drul_[RIGHT])
     {
-      iv[RIGHT] = spanned_drul_[RIGHT]->column_l ()->rank_i ();
+      iv[RIGHT] = Paper_column::rank_i (spanned_drul_[RIGHT]->column_l ());
     }
   return iv;
 }
@@ -156,13 +150,16 @@ Spanner::get_bound (Direction d) const
 }
 
 void
-Spanner::set_bound(Direction d, Item*i)
+Spanner::set_bound(Direction d, Score_element*s)
 {
-  spanned_drul_[d] =i;
-  if (i)
+  Item * i = dynamic_cast<Item*> (s);
+  if (!i)
     {
-      i->used_b_ = true;
+      programming_error ("Must have Item for spanner bound.");
+      return;
     }
+  
+  spanned_drul_[d] =i;
 
   /**
      We check for Line_of_score to prevent the column -> line_of_score
@@ -171,15 +168,11 @@ Spanner::set_bound(Direction d, Item*i)
     {
       set_parent (i, X_AXIS);
     }
-  
-  if (spanned_drul_[Direction(-d)] == spanned_drul_[d]
-       && i)
-    warning (_f ("Spanner `%s' has equal left and right spanpoints",
-                classname (this)));
 }
 
 
-Spanner::Spanner ()
+Spanner::Spanner (SCM s)
+  : Score_element (s)
 {
   spanned_drul_[LEFT]=0;
   spanned_drul_[RIGHT]=0;
@@ -230,7 +223,7 @@ Spanner::find_broken_piece (Line_of_score*l) const
 int
 Spanner::compare (Spanner * const &p1, Spanner * const &p2)
 {
-  return p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_;
+  return  p1->line_l ()->rank_i_ - p2->line_l ()->rank_i_;
 }
 
 bool
@@ -239,38 +232,6 @@ Spanner::broken_b() const
   return broken_into_l_arr_.size();
 }
 
-Array<Rod>
-Spanner::get_rods () const
-{
-  Array<Rod> r;
-  return r;
-}
-
-Array<Spring>
-Spanner::get_springs () const
-{
-  Array<Spring> s;
-  return s;    
-}
-
-void
-Spanner::do_space_processing ()
-{
-  Array<Rod> rs (get_rods ());
-  for (int i=0; i < rs.size (); i++)
-    {
-      rs[i].add_to_cols ();
-    }
-
-  Array<Spring> ss (get_springs ());
-  for (int i=0; i < ss.size (); i++)
-    {
-      if (isinf (ss[i].distance_f_))
-       programming_error ("weird spring");
-      else
-       ss[i].add_to_cols ();
-    }
-}
 
 /*
   If this is a broken spanner, return the amount the left end is to be
@@ -298,3 +259,25 @@ Spanner::get_broken_left_end_align () const
 
   return 0.0;
 }
+
+void
+Spanner::do_derived_mark ()
+{
+  Direction d = LEFT;
+  do
+    if (spanned_drul_[d])
+      scm_gc_mark (spanned_drul_[d]->self_scm_);
+  while (flip (&d) != LEFT);
+
+  for (int i= broken_into_l_arr_.size () ; i--;)
+    scm_gc_mark (broken_into_l_arr_[i]->self_scm_);
+}
+
+void
+add_bound_item (Spanner* sp, Item*it)
+{
+  if (!sp->get_bound (LEFT))
+    sp->set_bound (LEFT, it);
+  else
+    sp->set_bound (RIGHT, it);
+}