source file of the GNU LilyPond music typesetter
- (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "rest-collision.hh"
+
#include <math.h> // ceil.
#include "warn.hh"
-#include "rest-collision.hh"
#include "note-column.hh"
#include "stem.hh"
#include "rhythmic-head.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "rest.hh"
#include "group-interface.hh"
#include "staff-symbol-referencer.hh"
#include "duration.hh"
#include "directional-element-interface.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)
{
Grob *them = unsmob_grob (element_smob);
- Axis a = (Axis) gh_scm2int (axis);
+ Axis a = (Axis) scm_to_int (axis);
assert (a == Y_AXIS);
- Grob * rc = unsmob_grob (them->get_property ("rest-collision"));
-
- if (rc && !to_boolean (rc->get_property ("positioning-done")))
- {
- rc->set_property ("positioning-done", SCM_BOOL_T);
+ if (Note_column::has_rests (them))
+ {
+ Grob * rc = unsmob_grob (them->get_property ("rest-collision"));
- do_shift (rc);
- }
-
- return gh_double2scm (0.0);
+ if (rc && !to_boolean (rc->get_property ("positioning-done")))
+ {
+ rc->set_property ("positioning-done", SCM_BOOL_T);
+ do_shift (rc);
+ }
+ }
+ return scm_make_real (0.0);
}
+MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2);
+SCM
+Rest_collision::force_shift_callback_rest (SCM rest, SCM axis)
+{
+ Grob *rest_grob = unsmob_grob (rest);
+ assert ((Axis) scm_to_int (axis) == Y_AXIS);
+
+ Grob *parent = rest_grob->get_parent (X_AXIS);
+ if (Note_column::has_interface (parent))
+ return force_shift_callback (parent->self_scm(), axis);
+ else
+ return scm_make_real (0.0);
+}
+
void
-Rest_collision::add_column (Grob*me,Grob *p)
+Rest_collision::add_column (Grob*me, Grob *p)
{
me->add_dependency (p);
Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p);
*/
p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS);
p->set_property ("rest-collision", me->self_scm ());
-}
-
-/*
- Combination of dot-count and duration-log.
- */
-static SCM
-head_characteristic (Grob * col)
-{
- Grob * s = unsmob_grob (col->get_property ("rest"));
-
- if (!s)
- return SCM_BOOL_F;
- else
- return gh_cons (s->get_property ("duration-log"),
- gh_int2scm (Rhythmic_head::dot_count (s)));
+ Grob *rest = unsmob_grob (p->get_property ("rest"));
+ if (rest)
+ {
+ rest->add_offset_callback (Rest_collision::force_shift_callback_rest_proc,
+ Y_AXIS);
+ }
}
/*
- 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
Link_array<Grob> rests;
Link_array<Grob> notes;
- for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s))
+ for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s))
{
- Grob * e = unsmob_grob (ly_car (s));
+ Grob * e = unsmob_grob (scm_car (s));
if (unsmob_grob (e->get_property ("rest")))
{
/*
center one should be centered on the staff.
*/
Drul_array< Link_array <Grob > > ordered_rests;
- for (int i= 0; i < rests.size (); i++)
+ for (int i = 0; i < rests.size (); i++)
{
Grob * r = Note_column::get_rest (rests[i]);
ordered_rests[d].sort (Note_column::shift_compare);
} while (flip (&d) != LEFT);
- if (ordered_rests[UP].size () + ordered_rests[DOWN].size () < 2)
- return SCM_UNSPECIFIED;
+ do {
+ if (ordered_rests[d].size () < 1)
+ {
+ if (ordered_rests[-d].size() > 1)
+ ordered_rests[-d][0]->warning (_ ("too many colliding rests"));
+
+ return SCM_UNSPECIFIED;
+ }
+ } while (flip (&d) != LEFT);
Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS);
common = common_refpoint_of_array (ordered_rests[UP], common, Y_AXIS);
Real diff =
(ordered_rests[DOWN].top ()->extent (common, Y_AXIS)[UP]
- - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) /staff_space;
+ - ordered_rests[UP].top ()->extent (common, Y_AXIS)[DOWN]) / staff_space;
if (diff > 0)
{
Real diff = d * ((last_y - y) /staff_space);
if (diff > 0)
- Note_column::translate_rests (ordered_rests[d][i],d * (int) ceil (diff) * 2);
+ Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2);
}
} while (flip (&d) != LEFT);
}
Grob * rcol = 0;
Direction dir = CENTER;
- for (int i= rests.size (); !rcol && i--;)
+ for (int i = rests.size (); !rcol && i--;)
if (Note_column::dir (rests[i]))
{
dir = Note_column::dir (rests[i]);
if (discrete_dist < stafflines+1)
discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0);
- Note_column::translate_rests (rcol,dir * discrete_dist);
+ Note_column::translate_rests (rcol, dir * discrete_dist);
}
return SCM_UNSPECIFIED;
}
-ADD_INTERFACE (Rest_collision,"rest-collision-interface",
- "Move around ordinary rests (not multi-measure-rests) to avoid "
-"conflicts.",
- "minimum-distance positioning-done elements");
+ADD_INTERFACE (Rest_collision, "rest-collision-interface",
+ "Move around ordinary rests (not multi-measure-rests) to avoid "
+ "conflicts.",
+ "minimum-distance positioning-done elements");