* lily/accidental-placement.cc (split_accidentals): new function

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

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 8890ddbdd7aec24f890796fc0398616a12d23cd2..f4471530bf217091788c94b30925299ff52d3d84 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -3,93 +3,120 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "separating-group-spanner.hh"
-#include "single-malt-grouping-item.hh"
+#include "separation-item.hh"
 #include "paper-column.hh"
 #include "paper-def.hh"
 #include "dimensions.hh"
+#include "group-interface.hh"
 
-static Rod
-make_rod (Single_malt_grouping_item *l, Single_malt_grouping_item *r)
+void
+Separating_group_spanner::find_rods (Item * r, SCM next)
 {
-  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
-{
-  Array<Rod> a;
-  
-  for (int i=0; i < spacing_unit_l_arr_.size () -1; i++)
+  /*
+    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))
     {
-      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));
-      
-      a.push (make_rod(spacing_unit_l_arr_[i], spacing_unit_l_arr_[i+1]));
+      Item *l = dynamic_cast<Item*> (unsmob_grob (ly_car( next)));
+      Item *lb = l->find_prebroken_piece (RIGHT);
+
       if (lb)
        {
-         Rod rod(make_rod (lb, r));
-         rod.distance_f_ += padding_f_;
-         a.push (rod);
-       }
-      
-      if (rb)
-       {
-         a.push (make_rod (l, rb));
+         Interval li (Separation_item::width (lb));
+         Interval ri (Separation_item::conditional_width (r, lb));
+         if (!li.empty_b () && !ri.empty_b())
+           {
+             Rod rod;
+
+             rod.item_l_drul_[LEFT] = lb;
+             rod.item_l_drul_[RIGHT] = r;
+
+             rod.distance_f_ = li[RIGHT] - ri[LEFT];
+       
+             rod.columnize ();
+             rod.add_to_cols ();
+           }
        }
-      
-      if (lb && rb)
+
+      Interval li (Separation_item::width (l));
+      Interval ri (Separation_item::conditional_width (r, l));
+      if (!li.empty_b () && !ri.empty_b())
        {
-         Rod rod(make_rod (lb, rb));
-         rod.distance_f_ += padding_f_;
-         a.push (rod);
+         Rod rod;
+
+         rod.item_l_drul_[LEFT] =l;
+         rod.item_l_drul_[RIGHT]=r;
+
+         rod.distance_f_ = li[RIGHT] - ri[LEFT];
+       
+         rod.columnize ();
+         rod.add_to_cols ();
+
+         break;
        }
+      else
+       /*
+         this grob doesn't cause a constraint. We look further until we
+         find one that does.  */
+       ;
     }
-      
-  return a;
 }
 
-void
-Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
+MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods_and_seqs,1);
+SCM
+Separating_group_spanner::set_spacing_rods_and_seqs (SCM smob)
 {
-  spacing_unit_l_arr_.push (i);
-  add_dependency (i);
+  set_spacing_rods (smob);
+
+  return SCM_UNSPECIFIED;
 }
 
-void
-Separating_group_spanner::do_substitute_element_pointer (Score_element*o,
-                                                        Score_element*n)
+MAKE_SCHEME_CALLBACK (Separating_group_spanner,set_spacing_rods,1);
+SCM
+Separating_group_spanner::set_spacing_rods (SCM smob)
 {
-  if (dynamic_cast<Single_malt_grouping_item *> (o))
+  Grob*me = unsmob_grob (smob);
+  
+  for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s))
     {
-      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);
+      /*
+       Order of elements is reversed!
+       */
+      SCM elt = ly_car (s);
+      Item *r = unsmob_item (elt);
+
+      if (!r)
+       continue;
+
+      Item *rb
+       = dynamic_cast<Item*> (r->find_prebroken_piece (LEFT));
+      
+      find_rods (r, ly_cdr (s));
+      if (rb)
+       find_rods (rb, ly_cdr (s));
     }
+
+  return SCM_UNSPECIFIED ;
 }
 
-Separating_group_spanner::Separating_group_spanner()
+void
+Separating_group_spanner::add_spacing_unit (Grob* me ,Item*i)
 {
-  set_elt_property (break_helper_only_scm_sym, SCM_BOOL_T);
-  padding_f_ =0.0;
+  Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), i);
+  me->add_dependency (i);
 }
+
+
+
+
+
+ADD_INTERFACE (Separating_group_spanner,"separation-spanner-interface",
+  "Spanner that containing @code{separation-item-interface} grobs to calculate rods",
+  "");