#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)
{
+ Score_element *them = unsmob_element (element_smob);
+ Axis a = (Axis) gh_scm2int (axis);
assert (a == Y_AXIS);
- Score_element * rc = unsmob_element (them->get_elt_pointer ("rest-collision"));
+ Score_element * rc = unsmob_element (them->get_elt_property ("rest-collision"));
if (rc)
{
/*
Done: destruct pointers, so we do the shift only once.
*/
- SCM elts = rc->get_elt_pointer ("elements");
- rc->set_elt_pointer ("elements", SCM_EOL);
+ SCM elts = rc->get_elt_property ("elements");
+ rc->set_elt_property ("elements", SCM_EOL);
do_shift (rc, elts);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
void
-Rest_collision::add_column (Note_column *p)
+Rest_collision::add_column (Score_element*me,Score_element *p)
{
- elt_l_->add_dependency (p);
- Pointer_group_interface gi (elt_l_);
- gi.add_element (p);
+ me->add_dependency (p);
+ Pointer_group_interface::add_element (me, "elements", p);
- p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS);
- p->set_elt_pointer ("rest-collision", elt_l_->self_scm_);
+ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
+ p->set_elt_property ("rest-collision", me->self_scm ());
}
-/*
- these 3 have to go, because they're unnecessary complications.
- */
-static Duration
-to_duration (int type, int dots)
-{
- Duration d;
- d.durlog_i_ = type;
- d.dots_i_ = dots;
- return d;
-}
/*
- UGH
-
- elt_l_ should be "duration" independent
+ Combination of dot-count and duration-log.
*/
-static Moment
-rhythmic_head2mom (Rhythmic_head* r)
+static SCM
+head_characteristic (Score_element * col)
{
- return to_duration (r->balltype_i (), r->dot_count ()).length_mom ();
-}
+ Score_element * s = unsmob_element (col->get_elt_property ("rest"));
-/*
- ugh
- */
-static Rhythmic_head*
-col2rhythmic_head (Score_element* c)
-{
- return dynamic_cast<Rhythmic_head*> (unsmob_element (c->get_elt_pointer ("rest")));
+ if (!s)
+ return SCM_BOOL_F;
+ else
+ return gh_cons (s->get_elt_property ("duration-log"),
+ gh_int2scm (Rhythmic_head::dot_count (s)));
}
-
/*
TODO: fixme, fucks up if called twice on the same set of rests.
*/
/*
ugh. -> score elt type
*/
- Link_array<Note_column> rests;
- Link_array<Note_column> notes;
+ Link_array<Score_element> rests;
+ Link_array<Score_element> notes;
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_pointer ("rest")))
- rests.push (dynamic_cast<Note_column*> (e));
+ if (e && unsmob_element (e->get_elt_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())
{
- Moment m = rhythmic_head2mom (col2rhythmic_head (rests[0]));
+ SCM characteristic = head_characteristic (rests[0]);
int i = 1;
for (; i < rests.size (); i++)
{
- Moment me = rhythmic_head2mom (col2rhythmic_head (rests[i]));
- if (me != m)
+ if (!gh_equal_p (head_characteristic (rests[i]), characteristic))
break;
}
{
display_count = gh_scm2int (s);
for (; i > display_count; i--)
- col2rhythmic_head (rests[i-1])
- ->set_elt_property ("molecule-callback", SCM_BOOL_T);
+ {
+ Score_element* r = unsmob_element (rests[i-1]->get_elt_property ("rest"));
+ if (r)
+ r->suicide ();
+ rests[i-1]->suicide ();
+ }
}
else
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];
+ Score_element * rcol = rests[0];
// try to be opposite of noteheads.
- Direction dir = - notes[0]->dir();
+ Direction dir = - Note_column::dir (notes[0]);
- Interval restdim = rcol->rest_dim ();
+ Interval restdim = Note_column::rest_dim (rcol);
if (restdim.empty_b ())
- return SCM_UNDEFINED;
+ return SCM_UNSPECIFIED;
// staff ref'd?
- Real staff_space = me->paper_l()->get_var ("interline");
+ Real staff_space = 1.0;
/* FIXME
staff_space = rcol->rests[0]->staff_space ();
Interval notedim;
for (int i = 0; i < notes.size(); i++)
{
- notedim.unite (notes[i]->extent (Y_AXIS));
+ notedim.unite (notes[i]->extent (notes[i],Y_AXIS)); // refp?
}
Interval inter (notedim);
// FIXME
//int stafflines = 5; // rcol->rests[0]->line_count;
- int stafflines = Staff_symbol_referencer_interface (me).line_count ();
+ int stafflines = Staff_symbol_referencer::line_count (me);
// hurg?
stafflines = stafflines != 0 ? stafflines : 5;
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 ()
+Rest_collision::set_interface (Score_element*me)
{
- elt_l_->set_extent_callback (0, X_AXIS);
- elt_l_->set_extent_callback (0, Y_AXIS);
- elt_l_->set_elt_pointer ("elements", SCM_EOL);
+ me->set_extent_callback (SCM_EOL, X_AXIS);
+ me->set_extent_callback (SCM_EOL, Y_AXIS);
}
-Rest_collision::Rest_collision (Score_element* c)
-{
- elt_l_ = c;
-}
projects / lilypond.git / blobdiff