X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=0610762f2d4fbec0287be76d27c2ad0942ea4077;hb=89bf299597169eeaa5ed7a215b6e808fa849c8cd;hp=41c2c515e6304eb9b9210b6fd8228fd708839f12;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 41c2c515e6..0610762f2d 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,68 +3,108 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separating-group-spanner.hh"
-#include "single-malt-grouping-item.hh"
-#include "p-col.hh"
+#include "separation-item.hh"
+#include "paper-column.hh"
 #include "paper-def.hh"
+#include "dimensions.hh"
+#include "group-interface.hh"
 
-Array<Rod>
-Separating_group_spanner::get_rods () const
+static void
+do_rod (Item *l, Item *r)
 {
-  Array<Rod> a;
+  Rod rod;
+
+  Interval li (Separation_item::my_width (l));
+  Interval ri (Separation_item::my_width (r));
+
+  rod.item_l_drul_[LEFT] =l;
+  rod.item_l_drul_[RIGHT]=r;
+
+  if (li.empty_b () || ri.empty_b ())
+    rod.distance_f_ = 0;
+  else
+    rod.distance_f_ = li[RIGHT] - ri[LEFT];
+
+  rod.columnize ();
+  rod.add_to_cols ();
+}
+  
+MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods,1);
+SCM
+Separating_group_spanner::set_spacing_rods (SCM smob)
+{
+  Grob*me = unsmob_grob (smob);
   
-  for (int i=0; i < spacing_unit_l_arr_.size () -1; i++)
+  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
     {
-      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));
-      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));
+      /*
+	Order of elements is reversed!
+       */
+      SCM elt = gh_cadr (s);
+      SCM next_elt = gh_car (s);
+
+      Item *l = dynamic_cast<Item*> (unsmob_grob (elt));
+      Item *r = dynamic_cast<Item*> (unsmob_grob ( next_elt));
+
+      if (!r || !l)
+	continue;
       
-      a.push (Rod (spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
+      Item *lb
+	= dynamic_cast<Item*>(l->find_prebroken_piece (RIGHT));
+
+      Item *rb
+	= dynamic_cast<Item*>(r->find_prebroken_piece (LEFT));
+      
+      do_rod(l,  r);
       if (lb)
 	{
-	  Rod rod(lb, r);
-	  rod.distance_f_ += paper ()->interline_f () *1.5;
-	  a.push (rod);
+	  do_rod (lb, r);
 	}
       
       if (rb)
 	{
-	  a.push (Rod (l, rb));
+	  do_rod (l, rb);
 	}
+      
       if (lb && rb)
 	{
-	  Rod rod(lb, rb);
-	  rod.distance_f_ += paper ()->interline_f () *1.5;
-	  a.push (rod);
+	  do_rod (lb, rb);
+
 	}
     }
-      
-  return a;
+
+  /*
+    We've done our job, so we get lost. 
+   */
+  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
+    {
+      Item * it =dynamic_cast<Item*>(unsmob_grob (gh_car (s)));
+      if (it && it->broken_b ())
+	{
+	  it->find_prebroken_piece (LEFT) ->suicide ();
+	  it->find_prebroken_piece (RIGHT)->suicide ();
+	}
+      it->suicide ();
+    }
+  me->suicide ();
+  return SCM_UNSPECIFIED ;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
+Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
 {
-  spacing_unit_l_arr_.push (i);
-  add_dependency (i);
+  Pointer_group_interface::add_element (me, "elements",i);
+  me->add_dependency (i);
 }
 
 
-
 void
-Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
+Separating_group_spanner::set_interface (Grob*)
 {
-  if (dynamic_cast<Single_malt_grouping_item *> (o))
-    {
-      Single_malt_grouping_item*ns = dynamic_cast<Single_malt_grouping_item *> (n);
-      spacing_unit_l_arr_.substitute (dynamic_cast<Single_malt_grouping_item *> (o), ns);
-    }
-}
 
+}