*/
#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)
+static void
+do_rod (Item *l, Item *r)
{
Rod rod;
- Interval li (l->my_width ());
- Interval ri (r->my_width ());
+ 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;
rod.distance_f_ = li[RIGHT] - ri[LEFT];
rod.columnize ();
- return rod;
+ rod.add_to_cols ();
}
-
-Array<Rod>
-Separating_group_spanner::get_rods () const
+MAKE_SCHEME_CALLBACK(Separating_group_spanner,set_spacing_rods);
+SCM
+Separating_group_spanner::set_spacing_rods (SCM smob)
{
- Array<Rod> a;
+ Score_element*me = unsmob_element (smob);
- for (SCM s = get_elt_pointer ("elements"); gh_pair_p (s) && gh_pair_p (gh_cdr (s)); s = gh_cdr (s))
+ 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);
- Single_malt_grouping_item *l = dynamic_cast<Single_malt_grouping_item*> (unsmob_element (elt));
- Single_malt_grouping_item *r = dynamic_cast<Single_malt_grouping_item*> (unsmob_element ( next_elt));
+ Item *l = dynamic_cast<Item*> (unsmob_element (elt));
+ Item *r = dynamic_cast<Item*> (unsmob_element ( next_elt));
if (!r || !l)
continue;
- Single_malt_grouping_item *lb
- = dynamic_cast<Single_malt_grouping_item*>(l->find_prebroken_piece (RIGHT));
+ Item *lb
+ = dynamic_cast<Item*>(l->find_prebroken_piece (RIGHT));
- Single_malt_grouping_item *rb
- = dynamic_cast<Single_malt_grouping_item*>(r->find_prebroken_piece (LEFT));
+ Item *rb
+ = dynamic_cast<Item*>(r->find_prebroken_piece (LEFT));
- a.push (make_rod(l, r));
+ do_rod(l, r);
if (lb)
{
- Rod rod(make_rod (lb, r));
- a.push (rod);
+ do_rod (lb, r);
}
if (rb)
{
- a.push (make_rod (l, rb));
+ do_rod (l, rb);
}
if (lb && rb)
{
- Rod rod(make_rod (lb, rb));
- a.push (rod);
+ do_rod (lb, rb);
+
}
}
/*
We've done our job, so we get lost.
*/
- for (SCM s = get_elt_pointer ("elements"); gh_pair_p (s); s = gh_cdr (s))
+ 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->suicide ();
}
-
- ((Separating_group_spanner *)this)->suicide ();
-
- return a;
+ me->suicide ();
+ return SCM_UNSPECIFIED ;
}
void
-Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
+Separating_group_spanner::add_spacing_unit (Score_element* me ,Item*i)
{
- Pointer_group_interface (this, "elements").add_element (i);
- add_dependency (i);
+ Pointer_group_interface (me, "elements").add_element (i);
+ me->add_dependency (i);
}
-Separating_group_spanner::Separating_group_spanner (SCM s)
- : Spanner (s)
+void
+Separating_group_spanner::set_interface (Score_element*me)
{
- set_elt_pointer ("elements", SCM_EOL);
+
}