source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+
#include <math.h> // ceil.
-#include "debug.hh"
+#include "warn.hh"
#include "rest-collision.hh"
#include "note-column.hh"
#include "stem.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"
#include "paper-def.hh"
#include "rest.hh"
#include "group-interface.hh"
#include "staff-symbol-referencer.hh"
#include "duration.hh"
-Real
-Rest_collision::force_shift_callback (Score_element const*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_pointer ("rest-collision"));
+ Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision"));
- if (rc)
+ if (rc && !to_boolean (rc->get_grob_property ("rest-collision-done")))
{
- /*
- Done: destruct pointers, so we do the shift only once.
- */
- SCM elts = rc->get_elt_pointer ("elements");
- rc->set_elt_pointer ("elements", SCM_EOL);
+ rc->set_grob_property ("rest-collision-done", SCM_BOOL_T);
- do_shift (rc, elts);
+ do_shift (rc);
}
- return 0.0;
+ return gh_double2scm (0.0);
}
void
-Rest_collision::add_column (Note_column *p)
+Rest_collision::add_column (Grob*me,Grob *p)
{
- elt_l_->add_dependency (p);
- Pointer_group_interface gi (elt_l_);
- gi.add_element (p);
+ me->add_dependency (p);
+ Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
- p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS);
- p->set_elt_pointer ("rest-collision", elt_l_->self_scm_);
-}
+ /*
+ only add callback for the rests, since we don't move anything
+ else.
-/*
- 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;
+ (not?)
+ */
+ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
+ p->set_grob_property ("rest-collision", me->self_scm ());
}
-/*
- UGH
-
- elt_l_ should be "duration" independent
- */
-static Moment
-rhythmic_head2mom (Rhythmic_head* r)
-{
- return to_duration (r->balltype_i (), r->dot_count ()).length_mom ();
-}
/*
- ugh
+ Combination of dot-count and duration-log.
*/
-static Rhythmic_head*
-col2rhythmic_head (Score_element* c)
+static SCM
+head_characteristic (Grob * col)
{
- return dynamic_cast<Rhythmic_head*> (unsmob_element (c->get_elt_pointer ("rest")));
-}
+ Grob * s = unsmob_grob (col->get_grob_property ("rest"));
+ if (!s)
+ return SCM_BOOL_F;
+ else
+ 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.
+
+ TODO: look at horizontal-shift to determine ordering between rests
+ for more than two voices.
*/
SCM
-Rest_collision::do_shift (Score_element *me, SCM elts)
+Rest_collision::do_shift (Grob *me)
{
- /*
- ugh. -> score elt type
- */
- Link_array<Note_column> rests;
- Link_array<Note_column> notes;
+ SCM elts = me->get_grob_property ("elements");
+
+ Link_array<Grob> rests;
+ Link_array<Grob> notes;
- for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s))
+ for (SCM s = elts; gh_pair_p (s); s = ly_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));
+ Grob * e = unsmob_grob (ly_car (s));
+ 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;
+ if (!rests.size ())
+ return SCM_UNSPECIFIED;
// no partners to collide with
- if (rests.size() + notes.size () < 2)
- return SCM_UNDEFINED;
+ if (rests.size () + notes.size () < 2)
+ return SCM_UNSPECIFIED;
// meisjes met meisjes
- if (!notes.size())
+ 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;
}
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_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--)
- col2rhythmic_head (rests[i-1])
- ->set_elt_property ("molecule-callback", SCM_BOOL_T);
+ {
+ Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest"));
+#if 1
+ if (r)
+ {
+ Grob * d = unsmob_grob (r->get_grob_property ("dot"));
+ if (d)
+ d->suicide();
+ r->suicide ();
+ }
+ rests[i-1]->suicide ();
+#else
+ if (r)
+ {
+
+ r->set_grob_property ("transparent", gh_bool2scm(1));
+ r = unsmob_grob (r->get_grob_property ("dot"));
+ if (r)
+ r->set_grob_property ("transparent", gh_bool2scm(1));
+ }
+#endif
+ }
}
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
{
if (rests.size () > 1)
{
- warning (_("too many colliding rests"));
+ warning (_ ("too many colliding rests"));
}
- if (notes.size () > 1)
+ Grob * rcol = rests[0];
+ Direction dir = Note_column::dir (rests[0]);
+
+ if (!dir)
{
- warning (_("too many notes for rest collision"));
+ dir = - Note_column::dir (notes[0]);
}
- Note_column * rcol = rests[0];
-
- // try to be opposite of noteheads.
- Direction dir = - notes[0]->dir();
+ 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_space = rcol->rests[0]->staff_space ();
- */
- Real minimum_dist = gh_scm2double (me->get_elt_property ("minimum-distance")) * staff_space;
-
- /*
- assumption: ref points are the same.
- */
+ Real staff_space = Staff_symbol_referencer::staff_space (rcol);
+
+ Real minimum_dist = gh_scm2double (me->get_grob_property ("minimum-distance")) * staff_space;
+
+
+ Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
+
Interval notedim;
- for (int i = 0; i < notes.size(); i++)
+ for (int i = 0; i < notes.size (); i++)
{
- notedim.unite (notes[i]->extent (Y_AXIS));
+ notedim.unite (notes[i]->extent (common, Y_AXIS));
}
Interval inter (notedim);
Real dist =
minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0;
-
- // FIXME
- //int stafflines = 5; // rcol->rests[0]->line_count;
- int stafflines = Staff_symbol_referencer_interface (me).line_count ();
- // hurg?
- stafflines = stafflines != 0 ? stafflines : 5;
+ int stafflines = Staff_symbol_referencer::line_count (me);
+ if (!stafflines)
+ {
+ programming_error ("No staff line count ? ");
+ stafflines =5;
+ }
// move discretely by half spaces.
int discrete_dist = int (ceil (dist / (0.5 *staff_space)));
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 ()
-{
- elt_l_->set_extent_callback (0, X_AXIS);
- elt_l_->set_extent_callback (0, Y_AXIS);
- elt_l_->set_elt_pointer ("elements", SCM_EOL);
-}
-Rest_collision::Rest_collision (Score_element* c)
-{
- elt_l_ = c;
-}
+ADD_INTERFACE (Rest_collision,"rest-collision-interface",
+ "Move around ordinary rests (not multi-measure-rests) to avoid "
+"conflicts.",
+ "maximum-rest-count minimum-distance rest-collision-done elements");
+
projects / lilypond.git / blobdiff