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 56d708ba511cf47a0d3c4c9b8c5c75904c773454..df01cfb4d0604ee8fdfbc36e4a422baecd7f8dd8 100644 (file)
--- a/lily/break-align-engraver.cc
+++ b/lily/break-align-engraver.cc
@@ -9,15 +9,17 @@
 #include "engraver.hh"
 #include "protected-scm.hh"
 #include "break-align-item.hh"
+#include "item.hh"
 #include "align-interface.hh"
 #include "axis-group-interface.hh"
-#include "dimension-cache.hh"
+
 
 class Break_align_engraver : public Engraver
 {
-  Break_align_item *align_l_;
+  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);
@@ -35,10 +37,16 @@ void
 Break_align_engraver::add_column (SCM smob)
 {
   Score_element * e = unsmob_element (smob);
-  Align_interface (align_l_).add_element (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 ()
 {
@@ -84,39 +92,43 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
       if (item_l->empty_b (X_AXIS) || item_l->parent_l (X_AXIS))
        return;
 
-      SCM bp=item_l->remove_elt_property ("breakable");
+      SCM bp=item_l->get_elt_property ("breakable");
       bool breakable = (to_boolean (bp));
       if (!breakable)
        return ;
 
-      SCM align_name = item_l->remove_elt_property ("break-align-symbol");
+      SCM align_name = item_l->get_elt_property ("break-align-symbol");
       if (!gh_symbol_p (align_name))
        return ;
 
       if (!align_l_)
        {
-         align_l_ = new Break_align_item;
-         align_l_->set_elt_property ("breakable", SCM_BOOL_T);
-         announce_element (Score_element_info (align_l_,0));
+         align_l_ = new Item (get_property ("basicBreakAlignProperties"));
+         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;
-         SCM edge_sym =   ly_symbol2scm ("Left_edge_item");
-         edge->set_elt_property ("break-align-symbol", edge_sym);
+         /*
+           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 ());
+         
 
-         Axis_group_interface (edge).set_axes (X_AXIS,X_AXIS);
          /*
            If the element is empty, it will be ignored in the break
            alignment stuff.
 
            TODO: switch off ignoring empty stuff?
          */
-         edge->dim_cache_[X_AXIS]->set_extent_callback (Dimension_cache::point_dimension_callback);
+         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 (Score_element_info(edge, 0));
-         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm_);
+         announce_element (edge, 0);
+         column_alist_ = scm_assoc_set_x (column_alist_, edge_sym, edge->self_scm ());
        }
 
       SCM s = scm_assoc (align_name, column_alist_);
@@ -130,16 +142,17 @@ Break_align_engraver::acknowledge_element (Score_element_info inf)
        }
       else
        {
-         group = new Item;
+         group = new Item (get_property ("basicBreakAlignGroupProperties"));
 
-         Axis_group_interface (group).set_interface ();
-         Axis_group_interface (group).set_axes (X_AXIS,X_AXIS);
+         Axis_group_interface::set_interface (group);
+         Axis_group_interface::set_axes (group, X_AXIS,X_AXIS);
 
          group->set_elt_property ("break-align-symbol", align_name);
          group->set_parent (align_l_, Y_AXIS);
-         announce_element (Score_element_info (group, 0));
-         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm_);
+         announce_element (group, 0);
+         column_alist_ = scm_assoc_set_x (column_alist_, align_name, group->self_scm ());
+
        }
-      Axis_group_interface (group).add_element (item_l);
+      Axis_group_interface::add_element (group, item_l);
     }
 }