source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "rest-collision.hh"
#include "duration.hh"
#include "directional-element-interface.hh"
-MAKE_SCHEME_CALLBACK (Rest_collision,force_shift_callback,2);
+MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 2);
SCM
Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
{
}
+MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2);
+SCM
+Rest_collision::force_shift_callback_rest (SCM rest, SCM axis)
+{
+ Grob *rest_grob = unsmob_grob (rest);
+ assert ((Axis) scm_to_int (axis) == Y_AXIS);
+
+ Grob *parent = rest_grob->get_parent (X_AXIS);
+ if (Note_column::has_interface (parent))
+ return force_shift_callback (parent->self_scm(), axis);
+ else
+ return scm_make_real (0.0);
+}
+
void
-Rest_collision::add_column (Grob*me,Grob *p)
+Rest_collision::add_column (Grob*me, Grob *p)
{
me->add_dependency (p);
Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
*/
p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
p->set_property ("rest-collision", me->self_scm ());
-}
-
+ Grob *rest = unsmob_grob (p->get_property ("rest"));
+ if (rest)
+ {
+ rest->add_offset_callback (Rest_collision::force_shift_callback_rest_proc,
+ Y_AXIS);
+ }
+}
/*
TODO: look at horizontal-shift to determine ordering between rests
center one should be centered on the staff.
*/
Drul_array< Link_array <Grob > > ordered_rests;
- for (int i= 0; i < rests.size (); i++)
+ for (int i = 0; i < rests.size (); i++)
{
Grob * r = Note_column::get_rest (rests[i]);
Real diff =
(ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
- - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) /staff_space;
+ - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
if (diff > 0)
{
Real diff = d * ((last_y - y) /staff_space);
if (diff > 0)
- Note_column::translate_rests (ordered_rests[d][i],d * (int) ceil (diff) * 2);
+ Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2);
}
} while (flip (&d) != LEFT);
}
Grob * rcol = 0;
Direction dir = CENTER;
- for (int i= rests.size (); !rcol && i--;)
+ for (int i = rests.size (); !rcol && i--;)
if (Note_column::dir (rests[i]))
{
dir = Note_column::dir (rests[i]);
if (discrete_dist < stafflines+1)
discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
- Note_column::translate_rests (rcol,dir * discrete_dist);
+ Note_column::translate_rests (rcol, dir * discrete_dist);
}
return SCM_UNSPECIFIED;
}
-ADD_INTERFACE (Rest_collision,"rest-collision-interface",
+ADD_INTERFACE (Rest_collision, "rest-collision-interface",
"Move around ordinary rests (not multi-measure-rests) to avoid "
"conflicts.",
"minimum-distance positioning-done elements");