X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fseparating-group-spanner.cc;h=7c62e720d9cfd8e46c014fced1ba822250bba4a3;hb=c659cb200486c2f908703696a1b2873e78c8160a;hp=992dba8d63b8dbaac975fcd252e310eee4c9e3bd;hpb=bfb10684605084baf1a898be8f42c0e463c5764a;p=lilypond.git

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 992dba8d63..7c62e720d9 100644
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,81 +3,74 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separating-group-spanner.hh"
+
 #include "separation-item.hh"
 #include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
 #include "dimensions.hh"
 #include "group-interface.hh"
 
 void
-Separating_group_spanner::find_rods (Item * r, SCM next)
+Separating_group_spanner::find_rods (Item * r, SCM next, Real padding)
 {
-  Interval ri (Separation_item::my_width (r));
-  if (ri.empty_b ())
-    return;
 
   /*
-    This is an inner loop, however, in most cases, the interesting L
-    will just be the first entry of NEXT, making it linear in most of
-    the cases.  */
-  for(; gh_pair_p (next); next = ly_cdr (next))
+    This is an inner loop: look for the first normal (unbroken) Left
+    grob.  This looks like an inner loop (ie. quadratic total), but in
+    most cases, the interesting L will just be the first entry of
+    NEXT, making it linear in most of the cases.
+  */
+  if (Separation_item::width (r).is_empty ())
+    return; 
+
+
+  for (; scm_is_pair (next); next = scm_cdr (next))
     {
-      Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car( next)));
+      Item *l = dynamic_cast<Item*> (unsmob_grob (scm_car ( next)));
       Item *lb = l->find_prebroken_piece (RIGHT);
 
       if (lb)
 	{
-	  Interval li (Separation_item::my_width (lb));
-
-	  if (!li.empty_b ())
+	  Interval li (Separation_item::width (lb));
+	  Interval ri (Separation_item::conditional_width (r, lb));
+	  if (!li.is_empty () && !ri.is_empty ())
 	    {
 	      Rod rod;
 
 	      rod.item_l_drul_[LEFT] = lb;
 	      rod.item_l_drul_[RIGHT] = r;
 
-	      rod.distance_f_ = li[RIGHT] - ri[LEFT];
-	
-	      rod.columnize ();
+	      rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
 	      rod.add_to_cols ();
 	    }
 	}
 
-      Interval li (Separation_item::my_width (l));
-      if (!li.empty_b ())
+      Interval li (Separation_item::width (l));
+      Interval ri (Separation_item::conditional_width (r, l));
+      if (!li.is_empty () && !ri.is_empty ())
 	{
 	  Rod rod;
 
 	  rod.item_l_drul_[LEFT] =l;
 	  rod.item_l_drul_[RIGHT]=r;
 
-	  rod.distance_f_ = li[RIGHT] - ri[LEFT];
+	  rod.distance_ = li[RIGHT] - ri[LEFT] + padding;
 	
-	  rod.columnize ();
 	  rod.add_to_cols ();
-
 	  break;
 	}
-      else
-	/*
-	  this grob doesn't cause a constraint. We look further until we
-	  find one that does.  */
-	;
-    }
-}
 
-MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods_and_seqs,1);
-SCM
-Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob)
-{
-  set_spacing_rods (smob);
+      /*
+	this grob doesn't cause a constraint. We look further until we
+	find one that does.
+      */
 
-  return SCM_UNSPECIFIED;
+    }
 }
 
 MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
@@ -85,13 +78,18 @@ SCM
 Separating_group_spanner::set_spacing_rods (SCM smob)
 {
   Grob*me = unsmob_grob (smob);
+
+  /*
+    Ugh: padding is added doubly, also for SeparationItem
+   */
+  Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
   
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s))
+  for (SCM s = me->get_property ("elements"); scm_is_pair (s) && scm_is_pair (scm_cdr (s)); s = scm_cdr (s))
     {
       /*
 	Order of elements is reversed!
        */
-      SCM elt = ly_car (s);
+      SCM elt = scm_car (s);
       Item *r = unsmob_item (elt);
 
       if (!r)
@@ -100,30 +98,11 @@ Separating_group_spanner::set_spacing_rods (SCM smob)
       Item *rb
 	= dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
       
-      find_rods (r, ly_cdr (s));
+      find_rods (r, scm_cdr (s), padding);
       if (rb)
-	find_rods (rb, ly_cdr (s));
+	find_rods (rb, scm_cdr (s), padding);
     }
 
-#if 0
-  /*
-    TODO; restore this.
-   */
-  /*
-    We've done our job, so we get lost. 
-   */
-  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s); s = ly_cdr (s))
-    {
-      Item * it =dynamic_cast<Item*> (unsmob_grob (ly_car (s)));
-      if (it && it->broken_b ())
-	{
-	  it->find_prebroken_piece (LEFT) ->suicide ();
-	  it->find_prebroken_piece (RIGHT)->suicide ();
-	}
-      it->suicide ();
-    }
-  me->suicide ();
-#endif
   return SCM_UNSPECIFIED ;
 }
 
@@ -139,5 +118,6 @@ Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
 
 
 ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
-  "Spanner that containing @code{separation-item-interface} grobs to calculate rods",
-  "");
+	       "A spanner that calculates spacing constraints (\"rods\") "
+	       "using the @code{separation-item-interface} grobs in @code{elements}.",
+	       "elements padding");