X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=7dd7c4cc3e5a2392365610ce4e27991a2a0bb263;hb=5c7d64ab0b4877bc8a659194034b7b74522f3d6c;hp=31a83715dbd5f8bd2b9b71d447d7f451dab977b4;hpb=3690941d0ee25e85156e8c0dae6fe2e21f7a0f83;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 31a83715db..7dd7c4cc3e 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,44 +3,63 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ +#include "rest-collision.hh" + #include // 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_grob_property ("rest-collision")); + if (Note_column::has_rests (them)) + { + Grob * rc = unsmob_grob (them->get_property ("rest-collision")); - if (rc && !to_boolean (rc->get_grob_property ("rest-collision-done"))) - { - rc->set_grob_property ("rest-collision-done", SCM_BOOL_T); + 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); +} - do_shift (rc); - } - - return gh_double2scm (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); @@ -49,50 +68,46 @@ Rest_collision::add_column (Grob*me,Grob *p) only add callback for the rests, since we don't move anything else. - (not?) + (not?) */ p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); - p->set_grob_property ("rest-collision", me->self_scm ()); -} + 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_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))); + 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. - - TODO: look at previous note to determine vertical position? */ SCM Rest_collision::do_shift (Grob *me) { - SCM elts = me->get_grob_property ("elements"); + SCM elts = me->get_property ("elements"); Link_array rests; Link_array 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)); - if (unsmob_grob (e->get_grob_property ("rest"))) - rests.push (e); + Grob * e = unsmob_grob (scm_car (s)); + if (unsmob_grob (e->get_property ("rest"))) + { + /* + Ignore rests under beam. + */ + Grob* st = unsmob_grob (e->get_property ("stem")); + if (st && unsmob_grob (st->get_property ("beam"))) + continue; + + rests.push (e); + } else notes.push (e); } @@ -103,110 +118,115 @@ Rest_collision::do_shift (Grob *me) [todo] * decide not to print rest if too crowded? - - * ignore rests under beams. */ - // no rests to collide - if (!rests.size ()) - return SCM_UNSPECIFIED; - - // no partners to collide with + /* + no partners to collide with + */ if (rests.size () + notes.size () < 2) return SCM_UNSPECIFIED; - // meisjes met meisjes + + Real staff_space = Staff_symbol_referencer::staff_space (me); + /* + only rests + */ if (!notes.size ()) { - SCM characteristic = head_characteristic (rests[0]); - int i = 1; - for (; i < rests.size (); i++) - { - 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). + This is incomplete: in case of an uneven number of rests, the + center one should be centered on the staff. */ - int display_count; - SCM s = me->get_grob_property ("maximum-rest-count"); - if (i == rests.size () - && gh_number_p (s) && gh_scm2int (s) < rests.size ()) + Drul_array< Link_array > ordered_rests; + for (int i = 0; i < rests.size (); i++) { - display_count = gh_scm2int (s); - for (; i > display_count; i--) + Grob * r = Note_column::get_rest (rests[i]); + + Direction d = get_grob_direction (r); + if (d) { - Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest")); - if (r) - { - Grob * d = unsmob_grob (r->get_grob_property ("dot")); - if (d) - d->suicide(); - r->suicide (); - } - rests[i-1]->suicide (); + ordered_rests[d].push (rests[i]); } + else + rests[d]->warning (_("rest direction not set. Cannot resolve collision.")); } - else - display_count = rests.size (); - - /* - Ugh. Should have minimum dist. - Ugh. What do we do if we have three different rests? - - */ - int dy = display_count > 2 ? 6 : 4; // FIXME Should get dims from table. - if (display_count > 1) + Direction d = LEFT; + do { + ordered_rests[d].sort (Note_column::shift_compare); + } while (flip (&d) != LEFT); + + 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; + + if (diff > 0) { - 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); + int amount_down = (int) ceil (diff / 2); + diff -= amount_down; + Note_column::translate_rests (ordered_rests[DOWN].top (), + -2 * amount_down); + if (diff > 0) + Note_column::translate_rests (ordered_rests[UP].top (), + 2 * int (ceil (diff))); } + + do { + for (int i = ordered_rests[d].size () -1; i-- > 0;) + { + Real last_y = ordered_rests[d][i+1]->extent (common, Y_AXIS)[d]; + Real y = ordered_rests[d][i]->extent (common, Y_AXIS)[-d]; + + Real diff = d * ((last_y - y) /staff_space); + if (diff > 0) + Note_column::translate_rests (ordered_rests[d][i], d * (int) ceil (diff) * 2); + } + } while (flip (&d) != LEFT); } - // meisjes met jongetjes else { + /* + Rests and notes. + */ if (rests.size () > 1) { warning (_ ("too many colliding rests")); } - Grob * rcol = rests[0]; - Direction dir = Note_column::dir (rests[0]); + Grob * rcol = 0; + Direction dir = CENTER; - if (!dir) - { - dir = - Note_column::dir (notes[0]); - } - Grob * r = unsmob_grob (rcol->get_grob_property ("rest")); - Interval restdim = r->extent (r, Y_AXIS); // ?? + for (int i = rests.size (); !rcol && i--;) + if (Note_column::dir (rests[i])) + { + dir = Note_column::dir (rests[i]); + rcol = rests[i]; + } + if (!rcol) + return SCM_UNSPECIFIED; + + Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); + + Interval restdim = rcol->extent (common, Y_AXIS); 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; - - - Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); + Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space; Interval notedim; for (int i = 0; i < notes.size (); i++) @@ -214,9 +234,6 @@ Rest_collision::do_shift (Grob *me) notedim.unite (notes[i]->extent (common, Y_AXIS)); } - Interval inter (notedim); - inter.intersect (restdim); - Real dist = minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0; @@ -233,15 +250,15 @@ Rest_collision::do_shift (Grob *me) // move by whole spaces inside the staff. 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.", - "maximum-rest-count minimum-distance rest-collision-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");