source file of the GNU LilyPond music typesetter
- (c) 1997--2002 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"
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.
-
- TODO: use rest-collision-done
- */
- SCM elts = rc->get_grob_property ("elements");
- rc->set_grob_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);
Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
/*
- only add callback for the rests, since we don't move anything else.
+ only add callback for the rests, since we don't move anything
+ else.
(not?)
*/
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 (Grob *me, SCM elts)
+Rest_collision::do_shift (Grob *me)
{
- /*
- ugh. -> score elt type
- */
+ SCM elts = me->get_grob_property ("elements");
+
Link_array<Grob> rests;
Link_array<Grob> notes;
- Grob * commony = 0;
+
for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
{
-
Grob * e = unsmob_grob (ly_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
{
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 ();
}
}
}
Grob * rcol = rests[0];
Direction dir = Note_column::dir (rests[0]);
-
+
+ if (!dir)
+ {
+ dir = - Note_column::dir (notes[0]);
+ }
Grob * r = unsmob_grob (rcol->get_grob_property ("rest"));
Interval restdim = r->extent (r, Y_AXIS); // ??
- if (restdim.empty_b ())
+ if (restdim.is_empty ())
return SCM_UNSPECIFIED;
Real staff_space = Staff_symbol_referencer::staff_space (rcol);
- Real minimum_dist = gh_scm2double (me->get_grob_property ("minimum-distance")) * staff_space;
+ Real minimum_dist = robust_scm2double (me->get_grob_property ("minimum-distance"), 1.0) * staff_space;
- Grob *common = rcol;
- for (int i = 0; i < notes.size (); i++)
- common = common->common_refpoint (notes[i], Y_AXIS);
+ Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS);
Interval notedim;
for (int i = 0; i < notes.size (); i++)
ADD_INTERFACE (Rest_collision,"rest-collision-interface",
- "Move around ordinary rests (not multi-measure-rests) to avoid
-conflicts.",
- "maximum-rest-count minimum-distance elements");
+ "Move around ordinary rests (not multi-measure-rests) to avoid "
+"conflicts.",
+ "maximum-rest-count minimum-distance positioning-done elements");