source file of the GNU LilyPond music typesetter
- (c) 1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 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 "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)
{
- Score_element *them = unsmob_element (element_smob);
+ 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)
+ if (rc && !to_boolean (rc->get_grob_property ("positioning-done")))
{
- /*
- Done: destruct pointers, so we do the shift only once.
- */
- SCM elts = rc->get_elt_property ("elements");
- rc->set_elt_property ("elements", SCM_EOL);
+ rc->set_grob_property ("positioning-done", SCM_BOOL_T);
- do_shift (rc, elts);
+ do_shift (rc);
}
return gh_double2scm (0.0);
}
void
-Rest_collision::add_column (Score_element*me,Score_element *p)
+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?)
+ */
p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
- p->set_elt_property ("rest-collision", me->self_scm ());
+ 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.
+
+ TODO: look at horizontal-shift to determine ordering between rests
+ for more than two voices.
+
+ TODO: look at previous note to determine vertical position?
+
*/
SCM
-Rest_collision::do_shift (Score_element *me, SCM elts)
+Rest_collision::do_shift (Grob *me)
{
- /*
- ugh. -> score elt type
- */
- Link_array<Score_element> rests;
- Link_array<Score_element> 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_property ("rest")))
+ Grob * e = unsmob_grob (ly_car (s));
+ 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_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 ();
+ {
+ Grob * d = unsmob_grob (r->get_grob_property ("dot"));
+ if (d)
+ d->suicide();
+ r->suicide ();
+ }
rests[i-1]->suicide ();
}
}
{
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]);
}
- Score_element * rcol = rests[0];
+ Grob * r = unsmob_grob (rcol->get_grob_property ("rest"));
+ Interval restdim = r->extent (r, Y_AXIS); // ??
- // try to be opposite of noteheads.
- Direction dir = - Note_column::dir (notes[0]);
-
- Interval restdim = Note_column::rest_dim (rcol);
- if (restdim.empty_b ())
+ if (restdim.is_empty ())
return SCM_UNSPECIFIED;
- // 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;
-
- /*
- assumption: ref points are the same.
- */
+ Real staff_space = Staff_symbol_referencer::staff_space (rcol);
+
+ Real minimum_dist = robust_scm2double (me->get_grob_property ("minimum-distance"), 1.0) * 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 (notes[i],Y_AXIS)); // refp?
+ 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::line_count (me);
- // hurg?
- stafflines = stafflines != 0 ? stafflines : 5;
+ 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)));
return SCM_UNSPECIFIED;
}
-void
-Rest_collision::set_interface (Score_element*me)
-{
- me->set_extent_callback (SCM_EOL, X_AXIS);
- me->set_extent_callback (SCM_EOL, Y_AXIS);
-}
+
+ADD_INTERFACE (Rest_collision,"rest-collision-interface",
+ "Move around ordinary rests (not multi-measure-rests) to avoid "
+"conflicts.",
+ "maximum-rest-count minimum-distance positioning-done elements");
projects / lilypond.git / blobdiff