release: 1.1.62

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

diff --git a/lily/axis-group-spanner.cc b/lily/axis-group-spanner.cc
index 344b4060cce15e9f96d5ab215973486fd5710bca..71064ac8b4b235eff42c0a7d40a1ca523c9978e3 100644 (file)
--- a/lily/axis-group-spanner.cc
+++ b/lily/axis-group-spanner.cc
@@ -3,12 +3,13 @@
 
   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-spanner.hh"
+#include "debug.hh"
 #include "item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 
 /** Do stuff if we're not broken. In this case the last and first
   columns usually are pre- and postbreak respectively,
@@ -17,29 +18,40 @@
 void
 Axis_group_spanner::do_break_processing_if_unbroken()
 {
-  Link_array<Score_elem> elems = elem_l_arr ();
+  Link_array<Score_element> elems = elem_l_arr ();
   Line_of_score *my_line = line_l();
   for (int i=0; i < elems.size(); i++) 
     {
       if (!elems[i]->line_l()) 
        {
-         Item * item_l = elems[i]->item();
+         Item * item_l = dynamic_cast<Item*> (elems[i]);
          if  (item_l
-              && item_l->breakable_b_ 
-              && item_l->break_status_i() == 0) 
+              && item_l->breakable_b ()
+              && item_l->break_status_dir() == 0) 
            {
              // last two checks are paranoia
              Item * broken_item_l = 
                item_l->find_prebroken_piece (my_line);
              add_element (broken_item_l);
            }
-         remove_element (elems[i]);  
+
+         Spanner *spanner_l = dynamic_cast<Spanner*> (elems[i]);
+         if (spanner_l)
+           {
+             Spanner *broken_spanner_l =
+               spanner_l->find_broken_piece (my_line);
+             add_element (broken_spanner_l);
+           }
+         remove_element (elems[i]);
        }
+      
     }
 }
+
 void
 Axis_group_spanner::do_break_processing()
 {
+
   bool breaking_self_b = ! Spanner::line_l();
   if (!breaking_self_b)  
     {
@@ -49,12 +61,12 @@ Axis_group_spanner::do_break_processing()
     }
 
   break_into_pieces ();
-  Link_array<Score_elem> loose_elems = elem_l_arr ();
+  Link_array<Score_element> loose_elems = elem_l_arr ();
   remove_all();
   
   for (int i=0; i < loose_elems.size(); i++) 
     {
-      Score_elem * elt = loose_elems[i];
+      Score_element * elt = loose_elems[i];
       Line_of_score *elt_line = elt->line_l();
        
       if (! elt_line)
@@ -62,41 +74,45 @@ Axis_group_spanner::do_break_processing()
          /* this piece doesn't know where it belongs.
             Find out if it was broken, and use the broken remains
             */
-         if (elt->spanner()) 
+
+         Item *it = dynamic_cast <Item *> (elt) ;        
+         if (Spanner * sp =dynamic_cast <Spanner *> (elt))
            {
-             Spanner * sp = elt->spanner();
-               
-             for (int j =0; j < broken_into_l_arr_.size(); j++) 
+             for (int j =0; j < sp->broken_into_l_arr_.size(); j++) 
                {
+                 Line_of_score *l = sp->broken_into_l_arr_[j]->line_l ();
+
                  Axis_group_spanner * my_broken_l
-                   = (Axis_group_spanner*)broken_into_l_arr_[j];
-                   
+                   = dynamic_cast<Axis_group_spanner*>(find_broken_piece (l));
+                 
                  Spanner * broken_span_l 
-                   = sp->find_broken_piece (
-                                            ((Score_elem*)my_broken_l)->line_l());
+                   = sp->find_broken_piece (l);
                    
                  if (broken_span_l) 
                    my_broken_l->add_element (broken_span_l);
-                   
                }
            }
-         else if (elt->item() 
-                  && elt->item()->breakable_b_ 
-                  && elt->item()->break_status_i () == 0) 
+         else if (it && it->broken_original_b ())
            {
              // broken items
              Direction  j=LEFT;
              do 
                {
-                 Item * my_item = elt->item()->broken_to_drul_[j];
-                 Line_of_score * item_line_l = my_item->line_l() ;
+                 Item * broken_item = it->find_prebroken_piece (j);
+                 Line_of_score * item_line_l = broken_item->line_l() ;
                  if (! item_line_l) 
                    continue;
                    
                  Axis_group_spanner * v
-                   = (Axis_group_spanner*)find_broken_piece (item_line_l);
+                   = dynamic_cast<Axis_group_spanner*>(find_broken_piece (item_line_l));
                  if (v)
-                   v->add_element (my_item);
+                   v->add_element (broken_item);
+                 else
+                   {
+                     broken_item->set_elt_property (transparent_scm_sym, SCM_BOOL_T);
+                     broken_item->set_empty (true);
+                   }
+
                }
              while (flip(&j) != LEFT);
            }
@@ -107,7 +123,7 @@ Axis_group_spanner::do_break_processing()
             Put it in appropriate piece of this spanner
             */
          Axis_group_spanner * my_broken_l
-           = (Axis_group_spanner*)find_broken_piece (elt->line_l());
+           = dynamic_cast<Axis_group_spanner*> (find_broken_piece (elt->line_l()));
          my_broken_l->add_element (elt);
        }
     }
@@ -119,8 +135,13 @@ void
 Axis_group_spanner::do_print() const
 {
   Axis_group_element::do_print();
-}
 
+  Spanner::do_print ();
+}
 
 
-IMPLEMENT_IS_TYPE_B2(Axis_group_spanner, Spanner, Axis_group_element);
+Interval
+Axis_group_spanner::do_width () const
+{
+  return Spanner::do_width ();
+}