patch::: 1.3.18.jcn3

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 5fb0da4792f5485a04d89a52c48fbfedd9bac27d..1af6d212831ccf819ba9697a3862cbac99993b09 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -13,13 +13,15 @@
 #include "paper-score.hh"
 #include "molecule.hh"
 #include "paper-outputter.hh"
-#include "score-column.hh"
+#include "paper-column.hh"
 #include "line-of-score.hh"
 #include "break-align-item.hh"
 
 void
-Spanner::break_into_pieces ()
+Spanner::do_break_processing()
 {
+  //break_into_pieces
+  
   if (line_l () || broken_b ())
     return;
   
@@ -99,13 +101,6 @@ Spanner::set_bounds(Direction d, Item*i)
 }
 
 
-
-void
-Spanner::do_break_processing()
-{
-  break_into_pieces ();
-}
-
 Spanner::Spanner ()
 {
   spanned_drul_[LEFT]=0;
@@ -126,8 +121,8 @@ Spanner::spanner_length() const
   Real r = spanned_drul_[RIGHT]->relative_coordinate (0, X_AXIS);
 
   if (r< l)
-    warning (_ ("spanner with negative length"));
-       
+    programming_error ("spanner with negative length");
+
   return r-l;
 }
 
@@ -145,9 +140,6 @@ Spanner::line_l() const
 Score_element*
 Spanner::find_broken_piece (Line_of_score*l) const
 {
-  Spanner* me = (Spanner*) this;
-  me->break_into_pieces ();
-  
   int idx = binsearch_link_array (broken_into_l_arr_,  (Spanner*)l, Spanner::compare);
   
   if (idx < 0)
@@ -208,7 +200,7 @@ Spanner::do_space_processing ()
 Real
 Spanner::get_broken_left_end_align () const
 {
-  Score_column *sc = dynamic_cast<Score_column*> (spanned_drul_[LEFT]->column_l());
+  Paper_column *sc = dynamic_cast<Paper_column*> (spanned_drul_[LEFT]->column_l());
 
   // Relevant only if left span point is first column in line
   if(sc != NULL &&
@@ -217,7 +209,7 @@ Spanner::get_broken_left_end_align () const
       /*
        
        We used to do a full search for the Break_align_item.
-       But that doesn't make a difference, since the Score_column
+       But that doesn't make a difference, since the Paper_column
        is likely to contain only a Break_align_item.
       */
       return sc->extent (X_AXIS)[RIGHT];