release: 1.2.9

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

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 185ba95e20f6ad3ba50075484cc5e8d7b8b450ef..590a10c78b978236da19b7551b5035c17b93a42c 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -9,8 +9,28 @@
 
 #include "separating-group-spanner.hh"
 #include "single-malt-grouping-item.hh"
-#include "p-col.hh"
+#include "paper-column.hh"
 #include "paper-def.hh"
+#include "dimensions.hh"
+
+static Rod
+make_rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
+{
+  Rod rod;
+  rod.item_l_drul_[LEFT] =l;
+  rod.item_l_drul_[RIGHT]=r;
+
+  Interval li (l->my_width ());
+  Interval ri (r->my_width ());
+  
+  if (li.empty_b () || ri.empty_b ())
+    rod.distance_f_ = 0;
+  else
+    rod.distance_f_ = li[RIGHT] - ri[LEFT];
+
+  return rod;
+}
+  
 
 Array<Rod>
 Separating_group_spanner::get_rods () const
@@ -21,27 +41,28 @@ Separating_group_spanner::get_rods () const
     {
       Single_malt_grouping_item *l =spacing_unit_l_arr_[i];
       Single_malt_grouping_item *lb
-       = dynamic_cast<Single_malt_grouping_item*>(l->find_prebroken_piece (RIGHT));
+       = dynamic_cast<Single_malt_grouping_item*>(l->find_broken_piece (RIGHT));
       Single_malt_grouping_item *r = spacing_unit_l_arr_[i+1];
       Single_malt_grouping_item *rb
-       = dynamic_cast<Single_malt_grouping_item*>(r->find_prebroken_piece (LEFT));
+       = dynamic_cast<Single_malt_grouping_item*>(r->find_broken_piece (LEFT));
       
-      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
+      a.push (make_rod(spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
       if (lb)
        {
-         Rod rod(lb, r);
-         rod.distance_f_ += paper ()->interline_f () *1.5;
+         Rod rod(make_rod (lb, r));
+         rod.distance_f_ += padding_f_;
          a.push (rod);
        }
       
       if (rb)
        {
-         a.push (Rod (l, rb));
+         a.push (make_rod (l, rb));
        }
+      
       if (lb && rb)
        {
-         Rod rod(lb, rb);
-         rod.distance_f_ += paper ()->interline_f () *1.5;
+         Rod rod(make_rod (lb, rb));
+         rod.distance_f_ += padding_f_;
          a.push (rod);
        }
     }
@@ -57,7 +78,8 @@ Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
 }
 
 void
-Separating_group_spanner::do_substitute_element_pointer (Score_element*o, Score_element*n)
+Separating_group_spanner::do_substitute_element_pointer (Score_element*o,
+                                                        Score_element*n)
 {
   if (dynamic_cast<Single_malt_grouping_item *> (o))
     {
@@ -68,5 +90,6 @@ Separating_group_spanner::do_substitute_element_pointer (Score_element*o, Score_
 
 Separating_group_spanner::Separating_group_spanner()
 {
-  break_helper_only_b_ = true;
+  set_elt_property (break_helper_only_scm_sym, SCM_BOOL_T);
+  padding_f_ =0.0;
 }