/*
- g-script-column.cc -- implement Script_column
+ script-column.cc -- implement Script_column
source file of the GNU LilyPond music typesetter
- (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "script-column.hh"
-#include "staff-side.hh"
-#include "dimension-cache.hh"
+#include "side-position-interface.hh"
+#include "group-interface.hh"
void
-Script_column::add_staff_sided (Item *i)
+Script_column::add_staff_sided (Score_element *me, Item *i)
{
SCM p = i->get_elt_property ("script-priority");
- if (p == SCM_UNDEFINED)
+ if (!gh_number_p (p))
return;
+
+ Pointer_group_interface::add_element (me, "scripts",i);
- staff_sided_item_l_arr_.push (i);
- add_dependency (i);
+ me->add_dependency (i);
}
static int
-staff_side_compare (Item * const &i1,
- Item * const &i2)
+staff_side_compare (Score_element * const &i1,
+ Score_element * const &i2)
{
SCM p1 = i1->get_elt_property ("script-priority");
SCM p2 = i2->get_elt_property ("script-priority");
return gh_scm2int (p1) - gh_scm2int (p2);
}
-void
-Script_column::do_pre_processing ()
-{
- Drul_array<Link_array<Item> > arrs;
+MAKE_SCHEME_CALLBACK(Script_column,before_line_breaking,1);
- for (int i=0; i < staff_sided_item_l_arr_.size (); i++)
+SCM
+Script_column::before_line_breaking (SCM smob)
+{
+ Score_element* me = unsmob_element (smob);
+ Drul_array<Link_array<Score_element> > arrs;
+ Link_array<Score_element> staff_sided
+ = Pointer_group_interface__extract_elements (me, (Score_element*)0, "scripts");
+
+
+ for (int i=0; i < staff_sided.size (); i++)
{
- Staff_sidify st (staff_sided_item_l_arr_[i]);
- arrs[st.get_direction ()].push (staff_sided_item_l_arr_[i]);
+ arrs[Side_position::get_direction (staff_sided[i])]
+ .push (staff_sided[i]);
}
Direction d = DOWN;
do {
- Link_array<Item> &arr(arrs[d]);
+ Link_array<Score_element> &arr(arrs[d]);
arr.sort (staff_side_compare);
- Item * last = 0;
+ Score_element * last = 0;
for (int i=0; i < arr.size (); i++)
{
- Staff_sidify s (arr[i]);
+
if (last)
- {
- s.add_support (last);
- }
+ Side_position::add_support( arr[i],last);
arr[i]->remove_elt_property ("script-priority");
last = arr[i];
}
} while (flip (&d) != DOWN);
+
+ return SCM_UNSPECIFIED;
}