patch::: 1.3.103.jcn3: Re: LilyPond 1.3.103

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index aa3bc9760cfb4cbcb10de497d3692e678efa7f2c..cbc7db0b0d03488c381dd8984b034e4971f794b6 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -37,7 +37,7 @@ void
 Break_align_engraver::add_column (SCM smob)
 {
   Score_element * e = unsmob_element (smob);
-  Break_align_item::add_element (align_l_,e);
+  Break_align_interface::add_element (align_l_,e);
   typeset_element (e);
 }
 
@@ -103,12 +103,19 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
 
       if (!align_l_)
        {
-         align_l_ = new Item (get_property ("basicBreakAlignProperties"));
-         Break_align_item::set_interface (align_l_);
+         align_l_ = new Item (get_property ("BreakAlignment"));
+         Break_align_interface::set_interface (align_l_);
          announce_element (align_l_,0);
 
          SCM edge_sym = ly_symbol2scm ("Left_edge_item");
-         Item * edge = new Item (get_property ("leftEdgeBasicProperties"));
+         Item * edge = new Item (get_property ("LeftEdge"));
+
+         /*
+           We must have left-edge in the middle.  Instrument-names
+           are left to left-edge, so they don't enter the staff.
+         */
+         align_l_->set_elt_property ("self-alignment-X", edge->self_scm ());
+         
 
          /*
            If the element is empty, it will be ignored in the break
@@ -116,9 +123,9 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
 
            TODO: switch off ignoring empty stuff?
          */
-         edge->set_extent_callback (Score_element::point_dimension_callback,X_AXIS);
+         edge->set_extent_callback (Score_element::point_dimension_callback_proc, X_AXIS);
          
-         align_l_->set_elt_property ("group-center-element", edge->self_scm ());
+         align_l_->set_elt_property ("self-alignment-X", edge->self_scm ());
 
          announce_element (edge, 0);
          column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
@@ -135,7 +142,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
        }
       else
        {
-         group = new Item (get_property ("basicBreakAlignGroupProperties"));
+         group = new Item (get_property ("BreakAlignGroup"));
 
          Axis_group_interface::set_interface (group);
          Axis_group_interface::set_axes (group, X_AXIS,X_AXIS);
@@ -144,6 +151,7 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          group->set_parent (align_l_, Y_AXIS);
          announce_element (group, 0);
          column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
+
        }
       Axis_group_interface::add_element (group, item_l);
     }