source file of the GNU LilyPond music typesetter
- (c) 1999--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "script-column.hh"
void
Script_column::add_staff_sided (Grob *me, Item *i)
{
- SCM p = i->get_grob_property ("script-priority");
- if (!gh_number_p (p))
+ SCM p = i->get_property ("script-priority");
+ if (!scm_is_number (p))
return;
Pointer_group_interface::add_grob (me, ly_symbol2scm ("scripts"),i);
me->add_dependency (i);
}
-static int
-staff_side_compare (Grob * const &i1,
- Grob * const &i2)
+LY_DEFINE (ly_grob_script_priority_less, "ly:grob-script-priority-less",
+ 2, 0, 0, (SCM a, SCM b),
+ "Compare two grobs by script priority. For internal use.")
{
- SCM p1 = i1->get_grob_property ("script-priority");
- SCM p2 = i2->get_grob_property ("script-priority");
+ Grob *i1 = unsmob_grob (a);
+ Grob *i2 = unsmob_grob (b);
- return gh_scm2int (p1) - gh_scm2int (p2);
-}
+ SCM p1 = i1->get_property ("script-priority");
+ SCM p2 = i2->get_property ("script-priority");
-MAKE_SCHEME_CALLBACK (Script_column,before_line_breaking,1);
+ return scm_to_int (p1) < scm_to_int (p2) ? SCM_BOOL_T : SCM_BOOL_F;
+}
+MAKE_SCHEME_CALLBACK (Script_column, before_line_breaking, 1);
SCM
Script_column::before_line_breaking (SCM smob)
{
Grob* me = unsmob_grob (smob);
- Drul_array<Link_array<Grob> > arrs;
- Link_array<Grob> staff_sided
- = Pointer_group_interface__extract_grobs (me, (Grob*)0, "scripts");
-
- for (int i=0; i < staff_sided.size (); i++)
+ Drul_array<SCM> scripts (SCM_EOL, SCM_EOL);
+ Link_array<Grob> staff_sided;
+
+ for (SCM s = me->get_property ("scripts"); scm_is_pair (s); s = scm_cdr (s))
{
- Direction d = Side_position_interface::get_direction (staff_sided[i]);
+ Grob *sc = unsmob_grob (scm_car (s));
+
+ /*
+ Don't want to consider scripts horizontally next to notes.
+ */
+ if (!sc->has_offset_callback (Side_position_interface::aligned_side_proc,
+ X_AXIS))
+ staff_sided.push (sc);
+ }
+
+ for (int i = 0; i < staff_sided.size (); i++)
+ {
+ Grob* g = staff_sided[i];
+ Direction d = Side_position_interface::get_direction (g);
if (!d)
{
programming_error ( "No direction for script?");
d = DOWN;
- staff_sided[i]->set_grob_property ("direction", gh_int2scm (d));
+ g->set_property ("direction", scm_int2num (d));
}
- arrs[d].push (staff_sided[i]);
+ scripts[d] = scm_cons (g->self_scm (), scripts[d]);
}
Direction d = DOWN;
- do {
- Link_array<Grob> &arr
- (arrs[d]);
-
- arr.sort (staff_side_compare);
-
- Grob * last = 0;
- for (int i=0; i < arr.size (); i++)
- {
-
- if (last)
- Side_position_interface::add_support (arr[i],last);
-
- arr[i]->set_grob_property ("script-priority", SCM_EOL);
- last = arr[i];
- }
-
- } while (flip (&d) != DOWN);
+ do
+ {
+ SCM ss = scm_reverse_x (scripts[d], SCM_EOL);
+ ss = scm_stable_sort_x (ss, ly_grob_script_priority_less_proc);
+
+ Grob * last = 0;
+ for (SCM s = ss; scm_is_pair (s); s = scm_cdr (s))
+ {
+ Grob *g = unsmob_grob (scm_car (s));
+ if (last)
+ Side_position_interface::add_support (g,last);
+
+ last = g;
+ }
+
+ } while (flip (&d) != DOWN);
return SCM_UNSPECIFIED;
}
-
ADD_INTERFACE (Script_column,"script-column-interface",
- "An interface that sorts scripts according to their @code{script-priority}",
- "");
-
-
+ "An interface that sorts scripts "
+ "according to their @code{script-priority}",
+ "");