* input/regression/markup-arrows.ly: new file.

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 0a72592b3218c6917758d3637bb72179916ea794..590c4d9473678009630ea353dc503f99632daa22 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -10,15 +10,14 @@
 
 #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
@@ -78,16 +77,16 @@ Spanner::do_break_processing ()
              broken_intos_.push (span);
            }
        }
-      while ((flip (&d))!= LEFT);
+      while ((flip (&d)) != LEFT);
     }
   else
     {
-      Link_array<Item> break_points = pscore_->system_->broken_col_range (left, right);
+      Link_array<Item> break_points = pscore_->root_system ()->broken_col_range (left, right);
 
       break_points.insert (left, 0);
       break_points.push (right);
 
-      for (int i =1; i < break_points.size (); i++)
+      for (int 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])
            {
@@ -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;
     }
 
@@ -208,10 +207,8 @@ 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 +223,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;
@@ -256,7 +253,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
@@ -291,24 +288,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--;)
     scm_gc_mark (broken_intos_[i]->self_scm ());
-
-  return SCM_EOL;
 }
 
 /*