release: 1.1.0

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

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index eca012b48500323dd39eaa660c55d693f35aed51..059afad994521fe15d33079eaf802d79ec5c9be0 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,28 +3,47 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.ruu.nl>
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separating-group-spanner.hh"
 #include "single-malt-grouping-item.hh"
+#include "p-col.hh"
+#include "paper-def.hh"
 
 Array<Rod>
 Separating_group_spanner::get_rods () const
 {
   Array<Rod> a;
-
+  
   for (int i=0; i < spacing_unit_l_arr_.size () -1; i++)
     {
-      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));    
-      if (spacing_unit_l_arr_[i]->breakable_b_)
+      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
+      bool lb =spacing_unit_l_arr_[i]->column_l ()->breakable_b_;
+      if (lb)
+       {
+         Rod r((Single_malt_grouping_item*)
+                      spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
+                      spacing_unit_l_arr_[i+1]);
+         r.distance_f_ += paper ()->interline_f () *1.5;
+         a.push (r);
+       }
+      bool rb=spacing_unit_l_arr_[i+1]->column_l ()->breakable_b_;
+      if (rb)
        {
-         a.push (Rod (spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT), spacing_unit_l_arr_[i+1]));
+         a.push (Rod (spacing_unit_l_arr_[i],
+                      (Single_malt_grouping_item*)
+                      spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
        }
-      if (spacing_unit_l_arr_[i+1]->breakable_b_)
+      if (lb && rb)
        {
-         a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT)));
+         Rod r((Single_malt_grouping_item*)
+                      spacing_unit_l_arr_[i]->find_prebroken_piece (RIGHT),
+                      (Single_malt_grouping_item*)
+                      spacing_unit_l_arr_[i+1]->find_prebroken_piece (LEFT));
+         r.distance_f_ += paper ()->interline_f () *1.5;
+         a.push (r);
        }
     }
       
@@ -41,12 +60,13 @@ Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
 IMPLEMENT_IS_TYPE_B1(Separating_group_spanner, Spanner);
 
 void
-Separating_group_spanner::do_substitute_dependency (Score_elem*o, Score_elem*n)
+Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
 {
   if (o->is_type_b (Single_malt_grouping_item::static_name ()))
     {
-      Single_malt_grouping_item*ns = n ? (Single_malt_grouping_item*)n->item () : 0;
-      spacing_unit_l_arr_.substitute ((Single_malt_grouping_item*)o->item (), ns);
+      Single_malt_grouping_item*ns = n ?
+       (Single_malt_grouping_item*)dynamic_cast <Item *> (n) : 0;
+      spacing_unit_l_arr_.substitute ((Single_malt_grouping_item*)dynamic_cast <Item *> (o), ns);
     }
 }