Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 644366f5a9917a01065329a68bc7834f0295bbd4..fb8cce00226d91ec9171f54cca78be2e907cb2da 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -1,110 +1,94 @@
-/*   
-  separating-group-spanner.cc --  implement Separating_group_spanner
-  
+/*
+  separating-group-spanner.cc -- implement Separating_group_spanner
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1998--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.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"
+#include "pointer-group-interface.hh"
 
-static void
-do_rod (Item *l, Item *r)
+void
+Separating_group_spanner::find_rods (Item *r,
+                                    vector<Grob*> const &separators,
+                                    vsize idx,
+                                    Real padding)
 {
-  Rod rod;
 
-  Interval li (Separation_item::my_width (l));
-  Interval ri (Separation_item::my_width (r));
+  /*
+    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.
+  */
+  for (; idx != VPOS; idx--)
+    {
+      Item *l = dynamic_cast<Item *> (separators[idx]);
+      Item *lb = l->find_prebroken_piece (RIGHT);
 
-  rod.item_l_drul_[LEFT] =l;
-  rod.item_l_drul_[RIGHT]=r;
+      if (lb)
+       {
+         Separation_item::set_distance (Drul_array<Item*> (lb, r), padding);
+       }
 
-  if (li.empty_b () || ri.empty_b ())
-    rod.distance_f_ = 0;
-  else
-    rod.distance_f_ = li[RIGHT] - ri[LEFT];
+      if (Separation_item::set_distance (Drul_array<Item *> (l, r), padding))
+       break;
 
-  rod.columnize ();
-  rod.add_to_cols ();
+      /*
+       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,1);
+
+MAKE_SCHEME_CALLBACK (Separating_group_spanner, set_spacing_rods, 1);
 SCM
 Separating_group_spanner::set_spacing_rods (SCM smob)
 {
-  Score_element*me = unsmob_element (smob);
-  
-  for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
-    {
-      /*
-       Order of elements is reversed!
-       */
-      SCM elt = gh_cadr (s);
-      SCM next_elt = gh_car (s);
+  Grob *me = unsmob_grob (smob);
 
-      Item *l = dynamic_cast<Item*> (unsmob_element (elt));
-      Item *r = dynamic_cast<Item*> (unsmob_element ( next_elt));
+  /*
+    Ugh: padding is added doubly, also for SeparationItem
+  */
+  Real padding = robust_scm2double (me->get_property ("padding"), 0.1);
+
+  extract_grob_set (me, "elements", elts);
+  for (vsize i = elts.size (); i-- > 1;)
+    {
+      Item *r = dynamic_cast<Item *> (elts[i]);
+      if (!r)
+       continue;
 
-      if (!r || !l)
+      if (Separation_item::width (r).is_empty ())
        continue;
-      
-      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)
-       {
-         do_rod (lb, r);
-       }
-      
-      if (rb)
-       {
-         do_rod (l, rb);
-       }
-      
-      if (lb && rb)
-       {
-         do_rod (lb, rb);
+       = dynamic_cast<Item *> (r->find_prebroken_piece (LEFT));
 
-       }
+      find_rods (r, elts, i - 1, padding);
+      if (rb)
+       find_rods (rb, elts, i - 1, padding);
     }
 
-  /*
-    We've done our job, so we get lost. 
-   */
-  for (SCM s = me->get_elt_property ("elements"); gh_pair_p (s); s = gh_cdr (s))
-    {
-      Item * it =dynamic_cast<Item*>(unsmob_element (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 ;
+  return SCM_UNSPECIFIED;
 }
 
 void
-Separating_group_spanner::add_spacing_unit (Score_element* me ,Item*i)
+Separating_group_spanner::add_spacing_unit (Grob *me, Item *i)
 {
-  Pointer_group_interface (me, "elements").add_element (i);
-  me->add_dependency (i);
+  Pointer_group_interface::add_unordered_grob (me, ly_symbol2scm ("elements"), i);
 }
 
+ADD_INTERFACE (Separating_group_spanner,
+              "A spanner that calculates spacing constraints (\"rods\") "
+              "using the @code{separation-item-interface} grobs in @code{elements}.",
 
-void
-Separating_group_spanner::set_interface (Score_element*me)
-{
-
-}
+              /* properties */
+              "elements "
+              "padding ");