patch::: 1.3.96.jcn9

[lilypond.git] / lily / break-align-item.cc

diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc
index 8fd6ba0b06b1961db161f9e8231b4d753b079bc1..1ffdb1325c7fab7e08d9a14ce46d6705c111237b 100644 (file)
--- a/lily/break-align-item.cc
+++ b/lily/break-align-item.cc
@@ -70,7 +70,6 @@ Break_align_interface::self_align_callback (SCM element_smob, SCM axis)
 void
 Break_align_interface::add_element (Score_element*me, Score_element *toadd)
 {
-  toadd->add_offset_callback (Break_align_interface_alignment_callback_proc, X_AXIS);
   Axis_group_interface::add_element (me, toadd);
 }
 
@@ -88,7 +87,7 @@ Break_align_interface::do_alignment (Score_element *me)
   
   for (int i=0; i < all_elems.size(); i++) 
     {
-      Interval y = all_elems[i]->extent(X_AXIS);
+      Interval y = all_elems[i]->extent(all_elems[i], X_AXIS);
       if (!y.empty_b())
        elems.push (dynamic_cast<Score_element*> (all_elems[i]));
     }
@@ -176,13 +175,13 @@ Break_align_interface::do_alignment (Score_element *me)
 
   Real pre_space = elems[0]->relative_coordinate (column, X_AXIS);
 
-  Real xl = elems[0]->extent (X_AXIS)[LEFT];
+  Real xl = elems[0]->extent (elems[0],X_AXIS)[LEFT];
   if (!isinf (xl))
     pre_space += xl;
   else
     programming_error ("Infinity reached. ");
 
-  Real xr = elems.top ()->extent (X_AXIS)[RIGHT];
+  Real xr = elems.top ()->extent (elems.top (), X_AXIS)[RIGHT];
   Real spring_len = elems.top ()->relative_coordinate (column, X_AXIS);
   if (!isinf (xr))
     spring_len += xr;
@@ -225,5 +224,5 @@ Break_align_interface::set_interface (Score_element*me)
   Align_interface::set_interface (me); 
   Align_interface::set_axis (me,X_AXIS);
 
-  me->add_offset_callback (Break_align_interface_self_align_callback_proc, X_AXIS);
+
 }