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 58214f51378b51387793665c6706196400957fbb..71064ac8b4b235eff42c0a7d40a1ca523c9978e3 100644 (file)
--- a/lily/axis-group-spanner.cc
+++ b/lily/axis-group-spanner.cc
@@ -9,7 +9,7 @@
 #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,
@@ -34,15 +34,24 @@ Axis_group_spanner::do_break_processing_if_unbroken()
                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()
 {
-  DOUT << "do_break_processing ()\n";
+
   bool breaking_self_b = ! Spanner::line_l();
   if (!breaking_self_b)  
     {
@@ -69,9 +78,9 @@ Axis_group_spanner::do_break_processing()
          Item *it = dynamic_cast <Item *> (elt) ;        
          if (Spanner * sp =dynamic_cast <Spanner *> (elt))
            {
-             for (int j =0; j < sp->broken_info_.size(); j++) 
+             for (int j =0; j < sp->broken_into_l_arr_.size(); j++) 
                {
-                 Line_of_score *l = sp->broken_info_[j].line_l_;
+                 Line_of_score *l = sp->broken_into_l_arr_[j]->line_l ();
 
                  Axis_group_spanner * my_broken_l
                    = dynamic_cast<Axis_group_spanner*>(find_broken_piece (l));