release: 1.3.92

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

diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc
index 3ca38f7db74572d81620e40948ca48b7c5a10a02..df01cfb4d0604ee8fdfbc36e4a422baecd7f8dd8 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -19,6 +19,7 @@ class Break_align_engraver : public Engraver
   Item *align_l_;
   Protected_scm column_alist_;
 protected:
+  virtual void do_removal_processing ();
   virtual void acknowledge_element(Score_element_info i);
   virtual void do_pre_move_processing ();
   void add_column (SCM);
@@ -36,10 +37,16 @@ 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);
 }
 
+void
+Break_align_engraver::do_removal_processing ()
+{
+  column_alist_ = SCM_EOL;
+}
+
 void
 Break_align_engraver::do_pre_move_processing ()
 {
@@ -97,12 +104,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_);
+         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"));
 
+         /*
+           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
            alignment stuff.
@@ -111,10 +125,10 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          */
          edge->set_extent_callback (Score_element::point_dimension_callback,X_AXIS);
          
-         align_l_->set_elt_property ("group-center-element", edge->self_scm_);
+         align_l_->set_elt_property ("group-center-element", edge->self_scm ());
 
          announce_element (edge, 0);
-         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm_);
+         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
        }
 
       SCM s = scm_assoc (align_name, column_alist_);
@@ -136,7 +150,8 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
          group->set_elt_property ("break-align-symbol", align_name);
          group->set_parent (align_l_, Y_AXIS);
          announce_element (group, 0);
-         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm_);
+         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
+
        }
       Axis_group_interface::add_element (group, item_l);
     }