release: 0.0.46.jcn1

[lilypond.git] / lily / spanner.cc

diff --git a/lily/spanner.cc b/lily/spanner.cc
index 87a01078aa675e08e805cd2624610e63960ef980..d2a8c2bc756a59224670a4155cdc7d1cb033f895 100644 (file)
--- a/lily/spanner.cc
+++ b/lily/spanner.cc
@@ -17,28 +17,29 @@ Spanner::broken_at(PCol*c1, PCol *c2)const
 {
     Spanner *span_p = do_break_at(c1,c2);
 
-    for (int i=0; i < dependants.size(); i++) {
-       dependants[i]->substitute_dependency((Staff_elem*)this, span_p); 
+    for (int i=0; i < dependant_l_arr_.size(); i++) {
+       dependant_l_arr_[i]->
+           substitute_dependency((Staff_elem*)this, span_p); 
     }
     
-    span_p->left = c1;
-    span_p->right = c2;
+    span_p->left_col_l_ = c1;
+    span_p->right_col_l_ = c2;
     
     return span_p;
 }
 
 Spanner::Spanner()
 {
-    left = right = 0;
+    left_col_l_ = right_col_l_ = 0;
 }
 
 
 Interval
 Spanner::width()const
 {
-    Real r = right->hpos;
-    Real l = left->hpos;
-    assert(*left < *right);
+    Real r = right_col_l_->hpos;
+    Real l = left_col_l_->hpos;
+    assert(*left_col_l_ < *right_col_l_);
     assert(r>=l);
        
     return Interval(0, r-l);