X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=589dd0dbecf9cb1e2739161b2dbbab691280a9df;hb=1da74a6f525cdbb102ad93bfbcc36a620a5754ee;hp=8ad587e88bd91a4b1a205821e38091b43780cec7;hpb=d0ab137f35caf66f7202cd2d7724c72eac092285;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 8ad587e88b..589dd0dbec 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,40 +3,38 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "rest-collision.hh" -#include // ceil. +#include // ceil. +using namespace std; -#include "warn.hh" +#include "directional-element-interface.hh" +#include "duration.hh" +#include "international.hh" #include "note-column.hh" -#include "stem.hh" -#include "rhythmic-head.hh" #include "output-def.hh" -#include "rest.hh" #include "pointer-group-interface.hh" +#include "rest.hh" +#include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" -#include "duration.hh" -#include "directional-element-interface.hh" +#include "stem.hh" +#include "warn.hh" -MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 2); +MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback, 1); SCM -Rest_collision::force_shift_callback (SCM element_smob, SCM axis) +Rest_collision::force_shift_callback (SCM smob) { - Grob *them = unsmob_grob (element_smob); - (void) axis; - assert (scm_to_int (axis) == Y_AXIS); - + Grob *them = unsmob_grob (smob); if (Note_column::has_rests (them)) { - Grob *rc = unsmob_grob (them->get_object ("rest-collision")); + Grob *collision = unsmob_grob (them->get_object ("rest-collision")); - if (rc && !to_boolean (rc->get_property ("positioning-done"))) + if (collision) { - rc->set_property ("positioning-done", SCM_BOOL_T); - do_shift (rc); + (void) collision->get_property ("positioning-done"); } } return scm_from_double (0.0); @@ -44,22 +42,26 @@ Rest_collision::force_shift_callback (SCM element_smob, SCM axis) MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2); SCM -Rest_collision::force_shift_callback_rest (SCM rest, SCM axis) +Rest_collision::force_shift_callback_rest (SCM rest, SCM offset) { Grob *rest_grob = unsmob_grob (rest); - assert ((Axis) scm_to_int (axis) == Y_AXIS); - Grob *parent = rest_grob->get_parent (X_AXIS); + + /* + translate REST; we need the result of this translation later on, + while the offset probably still is 0/calculation-in-progress. + */ + rest_grob->translate_axis (scm_to_double (offset), Y_AXIS); + if (Note_column::has_interface (parent)) - return force_shift_callback (parent->self_scm (), axis); - else - return scm_from_double (0.0); + force_shift_callback (parent->self_scm ()); + + return scm_from_double (0.0); } void Rest_collision::add_column (Grob *me, Grob *p) { - me->add_dependency (p); Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p); /* @@ -68,14 +70,14 @@ Rest_collision::add_column (Grob *me, Grob *p) (not?) */ - p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); + add_offset_callback (p, Rest_collision::force_shift_callback_proc, Y_AXIS); p->set_object ("rest-collision", me->self_scm ()); Grob *rest = unsmob_grob (p->get_object ("rest")); if (rest) { - rest->add_offset_callback (Rest_collision::force_shift_callback_rest_proc, - Y_AXIS); + chain_offset_callback (rest, + Rest_collision::force_shift_callback_rest_proc, Y_AXIS); } } @@ -83,15 +85,17 @@ Rest_collision::add_column (Grob *me, Grob *p) TODO: look at horizontal-shift to determine ordering between rests for more than two voices. */ +MAKE_SCHEME_CALLBACK(Rest_collision, calc_positioning_done, 1); SCM -Rest_collision::do_shift (Grob *me) +Rest_collision::calc_positioning_done (SCM smob) { + Grob *me = unsmob_grob (smob); extract_grob_set (me, "elements", elts); - Link_array rests; - Link_array notes; + vector rests; + vector notes; - for (int i = 0; i < elts.size (); i++) + for (vsize i = 0; i < elts.size (); i++) { Grob *e = elts[i]; if (unsmob_grob (e->get_object ("rest"))) @@ -103,10 +107,10 @@ Rest_collision::do_shift (Grob *me) if (st && unsmob_grob (st->get_object ("beam"))) continue; - rests.push (e); + rests.push_back (e); } else - notes.push (e); + notes.push_back (e); } /* @@ -133,21 +137,21 @@ Rest_collision::do_shift (Grob *me) This is incomplete: in case of an uneven number of rests, the center one should be centered on the staff. */ - Drul_array > ordered_rests; - for (int i = 0; i < rests.size (); i++) + Drul_array > ordered_rests; + for (vsize i = 0; i < rests.size (); i++) { Grob *r = Note_column::get_rest (rests[i]); Direction d = get_grob_direction (r); if (d) - ordered_rests[d].push (rests[i]); + ordered_rests[d].push_back (rests[i]); else rests[d]->warning (_ ("can't resolve rest collision: rest direction not set")); } Direction d = LEFT; do - ordered_rests[d].sort (Note_column::shift_compare); + vector_sort (ordered_rests[d], Note_column::shift_compare); while (flip (&d) != LEFT) ; @@ -167,23 +171,23 @@ Rest_collision::do_shift (Grob *me) 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[DOWN].back ()->extent (common, Y_AXIS)[UP] + - ordered_rests[UP].back ()->extent (common, Y_AXIS)[DOWN]) / staff_space; if (diff > 0) { int amount_down = (int) ceil (diff / 2); diff -= amount_down; - Note_column::translate_rests (ordered_rests[DOWN].top (), + Note_column::translate_rests (ordered_rests[DOWN].back (), -2 * amount_down); if (diff > 0) - Note_column::translate_rests (ordered_rests[UP].top (), + Note_column::translate_rests (ordered_rests[UP].back (), 2 * int (ceil (diff))); } do { - for (int i = ordered_rests[d].size () -1; i-- > 0;) + for (vsize 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]; @@ -205,7 +209,7 @@ Rest_collision::do_shift (Grob *me) Grob *rcol = 0; Direction dir = CENTER; - for (int i = rests.size (); !rcol && i--;) + for (vsize i = rests.size (); !rcol && i--;) if (Note_column::dir (rests[i])) { dir = Note_column::dir (rests[i]); @@ -225,7 +229,7 @@ Rest_collision::do_shift (Grob *me) Real minimum_dist = robust_scm2double (me->get_property ("minimum-distance"), 1.0) * staff_space; Interval notedim; - for (int i = 0; i < notes.size (); i++) + for (vsize i = 0; i < notes.size (); i++) notedim.unite (notes[i]->extent (common, Y_AXIS)); Real dist @@ -253,5 +257,9 @@ Rest_collision::do_shift (Grob *me) ADD_INTERFACE (Rest_collision, "rest-collision-interface", "Move around ordinary rests (not multi-measure-rests) to avoid " "conflicts.", - "minimum-distance positioning-done elements"); + + /* properties */ + "minimum-distance " + "positioning-done " + "elements");