patch::: 1.1.31.jcn1: Re: LilyPond 1.1.30

[lilypond.git] / lily / axis-group-item.cc

diff --git a/lily/axis-group-item.cc b/lily/axis-group-item.cc
index 2706fa8faa658fc8dffcd57fa05489f8bab009f0..1559e5dda352f1d796fc3bd737c3f9c0d60c37c8 100644 (file)
--- a/lily/axis-group-item.cc
+++ b/lily/axis-group-item.cc
@@ -3,20 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 #include "axis-group-item.hh"
 #include "p-col.hh"
 
-IMPLEMENT_IS_TYPE_B2(Axis_group_item, Axis_group_element, Item);
+
 
 void
 Axis_group_item::OK() const
 {
-  Link_array<Score_elem> elems = elem_l_arr ();
+  Link_array<Score_element> elems = elem_l_arr ();
   for (int i=0; i < elems.size(); i++) 
     {
-      Item * it_l = elems[i]->item();
+      Item * it_l = dynamic_cast<Item*> (elems[i]);
       assert (it_l);
     }
 }
@@ -24,23 +24,23 @@ Axis_group_item::OK() const
 void
 Axis_group_item::do_breakable_col_processing()
 {
-  if (!breakable_b_ || !column_l ()->breakable_b_) // ugh should merge with Item code
+  if (!breakable_b ()) // ugh should merge with Item code
     return;
-  
+
   OK();
   copy_breakable_items();
   
            
-  Link_array<Score_elem> elems = elem_l_arr ();
+  Link_array<Score_element> elems = elem_l_arr ();
   for (int i=0; i < elems.size(); i++) 
     {
-      Item* it_l = elems[i]->item();
+      Item* it_l = dynamic_cast<Item*> (elems[i]);
       Direction  j=LEFT;
       do 
        {
          Item *new_l = 
-           it_l->find_prebroken_piece (broken_to_drul_[j]->break_status_i_);
-         ((Axis_group_item*)broken_to_drul_[j])->add_element (new_l);
+           it_l->find_prebroken_piece (broken_to_drul_[j]->break_status_dir_);
+         (dynamic_cast<Axis_group_item*> (broken_to_drul_[j]))->add_element (new_l);
        }
       while (flip(&j)!=LEFT);
     }