source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
#include "staff-symbol-referencer.hh"
#include "duration.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)
{
- Grob *them = unsmob_element (element_smob);
+ Grob *them = unsmob_grob (element_smob);
Axis a = (Axis) gh_scm2int (axis);
assert (a == Y_AXIS);
- Grob * rc = unsmob_element (them->get_grob_property ("rest-collision"));
+ Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision"));
if (rc)
{
Rest_collision::add_column (Grob*me,Grob *p)
{
me->add_dependency (p);
- Pointer_group_interface::add_element (me, "elements", p);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
/*
only add callback for the rests, since we don't move anything else.
- (not?)
+ (not?)
*/
- p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
- p->set_grob_property ("rest-collision", me->self_scm ());
+ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
+ p->set_grob_property ("rest-collision", me->self_scm ());
}
static SCM
head_characteristic (Grob * col)
{
- Grob * s = unsmob_element (col->get_grob_property ("rest"));
+ Grob * s = unsmob_grob (col->get_grob_property ("rest"));
if (!s)
return SCM_BOOL_F;
/*
TODO: fixme, fucks up if called twice on the same set of rests.
+
+ TODO: look at horizontal-shift to determine ordering between rests
+ for more than two voices.
+
*/
SCM
Rest_collision::do_shift (Grob *me, SCM elts)
Link_array<Grob> rests;
Link_array<Grob> notes;
Grob * commony = 0;
- for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
{
- Grob * e = unsmob_element (gh_car (s));
+ Grob * e = unsmob_grob (ly_car (s));
if (!e)
continue;
if (!commony)
commony = e;
else
- commony= commony->common_refpoint (e, Y_AXIS);
+ commony= commony->common_refpoint (e, Y_AXIS);
- if (unsmob_element (e->get_grob_property ("rest")))
+ if (unsmob_grob (e->get_grob_property ("rest")))
rests.push (e);
else
notes.push (e);
*/
// no rests to collide
- if (!rests.size())
+ if (!rests.size ())
return SCM_UNSPECIFIED;
// no partners to collide with
- if (rests.size() + notes.size () < 2)
+ if (rests.size () + notes.size () < 2)
return SCM_UNSPECIFIED;
// meisjes met meisjes
- if (!notes.size())
+ if (!notes.size ())
{
- SCM characteristic = head_characteristic (rests[0]);
+ SCM characteristic = head_characteristic (rests[0]);
int i = 1;
for (; i < rests.size (); i++)
{
- if (!gh_equal_p (head_characteristic (rests[i]), characteristic))
+ if (!gh_equal_p (head_characteristic (rests[i]), characteristic))
break;
}
If all durations are the same, we'll check if there are more
rests than maximum-rest-count.
Otherwise (different durations), we'll try to display them all
- (urg: all 3 of them, currently).
+ (urg: all 3 of them, currently).
*/
int display_count;
SCM s = me->get_grob_property ("maximum-rest-count");
display_count = gh_scm2int (s);
for (; i > display_count; i--)
{
- Grob* r = unsmob_element (rests[i-1]->get_grob_property ("rest"));
+ Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
if (r)
r->suicide ();
rests[i-1]->suicide ();
{
if (rests.size () > 1)
{
- warning (_("too many colliding rests"));
+ warning (_ ("too many colliding rests"));
}
if (notes.size () > 1)
{
- warning (_("too many notes for rest collision"));
+ warning (_ ("too many notes for rest collision"));
}
Grob * rcol = rests[0];
// try to be opposite of noteheads.
Direction dir = - Note_column::dir (notes[0]);
- Grob * r = unsmob_element (rcol->get_grob_property ("rest"));
+ Grob * r = unsmob_grob (rcol->get_grob_property ("rest"));
Interval restdim = r->extent (r, Y_AXIS); // ??
if (restdim.empty_b ())
assumption: ref points are the same.
*/
Interval notedim;
- for (int i = 0; i < notes.size(); i++)
+ for (int i = 0; i < notes.size (); i++)
{
Grob * stem = Note_column::stem_l (notes[i]);
Grob * head = Stem::first_head (stem);