source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <math.h> // ceil.
#include "staff-symbol-referencer.hh"
#include "duration.hh"
-Real
-Rest_collision::force_shift_callback (Score_element *them, Axis a)
+MAKE_SCHEME_CALLBACK(Rest_collision,force_shift_callback,2);
+SCM
+Rest_collision::force_shift_callback (SCM element_smob, SCM axis)
{
+ Grob *them = unsmob_grob (element_smob);
+ Axis a = (Axis) gh_scm2int (axis);
assert (a == Y_AXIS);
- Score_element * rc = unsmob_element (them->get_elt_property ("rest-collision"));
+ Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision"));
if (rc)
{
/*
Done: destruct pointers, so we do the shift only once.
*/
- SCM elts = rc->get_elt_property ("elements");
- rc->set_elt_property ("elements", SCM_EOL);
+ SCM elts = rc->get_grob_property ("elements");
+ rc->set_grob_property ("elements", SCM_EOL);
do_shift (rc, elts);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
void
-Rest_collision::add_column (Score_element*me,Note_column *p)
+Rest_collision::add_column (Grob*me,Grob *p)
{
me->add_dependency (p);
- Pointer_group_interface gi (me);
- gi.add_element (p);
+ Pointer_group_interface::add_element (me, "elements", p);
+
+ /*
+ only add callback for the rests, since we don't move anything else.
- p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS);
- p->set_elt_property ("rest-collision", me->self_scm_);
+ (not?)
+ */
+ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
+ p->set_grob_property ("rest-collision", me->self_scm ());
}
+
+/*
+ Combination of dot-count and duration-log.
+ */
static SCM
-head_characteristic (Score_element * col)
+head_characteristic (Grob * col)
{
- Score_element * s = unsmob_element (col->get_elt_property ("rest"));
+ Grob * s = unsmob_grob (col->get_grob_property ("rest"));
if (!s)
return SCM_BOOL_F;
else
- return gh_cons (s->get_elt_property ("duration-log"),
+ return gh_cons (s->get_grob_property ("duration-log"),
gh_int2scm (Rhythmic_head::dot_count (s)));
}
TODO: fixme, fucks up if called twice on the same set of rests.
*/
SCM
-Rest_collision::do_shift (Score_element *me, SCM elts)
+Rest_collision::do_shift (Grob *me, SCM elts)
{
/*
ugh. -> score elt type
*/
- Link_array<Note_column> rests;
- Link_array<Note_column> notes;
-
+ Link_array<Grob> rests;
+ Link_array<Grob> notes;
+ Grob * commony = 0;
for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
{
- Score_element * e = unsmob_element (gh_car (s));
- if (e && unsmob_element (e->get_elt_property ("rest")))
- rests.push (dynamic_cast<Note_column*> (e));
+
+ Grob * e = unsmob_grob (gh_car (s));
+ if (!e)
+ continue;
+
+ if (!commony)
+ commony = e;
+ else
+ commony= commony->common_refpoint (e, Y_AXIS);
+
+ if (unsmob_grob (e->get_grob_property ("rest")))
+ rests.push (e);
else
- notes.push (dynamic_cast<Note_column*> (e));
+ notes.push (e);
}
// no rests to collide
if (!rests.size())
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
// no partners to collide with
if (rests.size() + notes.size () < 2)
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
// meisjes met meisjes
if (!notes.size())
{
-
- /*
- FIXME: col2rhythmic_head and rhythmic_head2mom sucks bigtime.
-
- */
SCM characteristic = head_characteristic (rests[0]);
int i = 1;
for (; i < rests.size (); i++)
(urg: all 3 of them, currently).
*/
int display_count;
- SCM s = me->get_elt_property ("maximum-rest-count");
+ SCM s = me->get_grob_property ("maximum-rest-count");
if (i == rests.size ()
&& gh_number_p (s) && gh_scm2int (s) < rests.size ())
{
display_count = gh_scm2int (s);
for (; i > display_count; i--)
{
- Score_element* r = unsmob_element (rests[i-1]->get_elt_property ("rest"));
+ Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
if (r)
r->suicide ();
rests[i-1]->suicide ();
display_count = rests.size ();
/*
- UGH. Should get dims from table. Should have minimum dist.
+ Ugh. Should have minimum dist.
+
+ Ugh. What do we do if we have three different rests?
+
*/
- int dy = display_count > 2 ? 6 : 4;
+ int dy = display_count > 2 ? 6 : 4; // FIXME Should get dims from table.
if (display_count > 1)
{
- rests[0]->translate_rests (dy);
- rests[1]->translate_rests (-dy);
+ Direction d0 = Note_column::dir (rests[0]);
+ Direction d1 = Note_column::dir (rests[1]);
+
+ if (!d0 && !d1)
+ {
+ d0= UP;
+ d1 = DOWN;
+ }
+ else if (!d0)
+ d0 = - d1;
+ else if (!d1)
+ d1 = -d0;
+
+ Note_column::translate_rests (rests[0],d0 *dy);
+ Note_column::translate_rests (rests[1], d1 *dy);
}
}
// meisjes met jongetjes
{
warning (_("too many notes for rest collision"));
}
- Note_column * rcol = rests[0];
+ Grob * rcol = rests[0];
// try to be opposite of noteheads.
- Direction dir = - notes[0]->dir();
+ Direction dir = - Note_column::dir (notes[0]);
+
+ Grob * r = unsmob_grob (rcol->get_grob_property ("rest"));
+ Interval restdim = r->extent (r, Y_AXIS); // ??
- Interval restdim = rcol->rest_dim ();
if (restdim.empty_b ())
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
- // staff ref'd?
- Real staff_space = me->paper_l()->get_var ("interline");
+ // FIXME: staff ref'd?
+ Real staff_space = 1.0;
- /* FIXME
- staff_space = rcol->rests[0]->staff_space ();
- */
- Real minimum_dist = gh_scm2double (me->get_elt_property ("minimum-distance")) * staff_space;
+ Real minimum_dist = gh_scm2double (me->get_grob_property ("minimum-distance")) * staff_space;
/*
assumption: ref points are the same.
Interval notedim;
for (int i = 0; i < notes.size(); i++)
{
- notedim.unite (notes[i]->extent (Y_AXIS));
+ Grob * stem = Note_column::stem_l (notes[i]);
+ Grob * head = Stem::first_head (stem);
+ notedim.unite (head->extent (commony, Y_AXIS));
}
Interval inter (notedim);
if (discrete_dist < stafflines+1)
discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
- rcol->translate_rests (dir * discrete_dist);
+ Note_column::translate_rests (rcol,dir * discrete_dist);
}
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
}
void
-Rest_collision::set_interface (Score_element*me)
+Rest_collision::set_interface (Grob*me)
{
- me->set_extent_callback (0, X_AXIS);
- me->set_extent_callback (0, Y_AXIS);
- me->set_elt_property ("elements", SCM_EOL);
+ me->set_extent_callback (SCM_EOL, X_AXIS);
+ me->set_extent_callback (SCM_EOL, Y_AXIS);
}
projects / lilypond.git / blobdiff