X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=f18c63a10cc466be2d2cfe5099decb0a8599c610;hb=128e91673163c6beeea6b9328e507d87be7175c9;hp=5f7f10f2559cbc1a1b6ace43b470bbe4a32eadb4;hpb=57be7394ffa2e7d7ba6d60548dba563f3409d472;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 5f7f10f255..f18c63a10c 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,63 +3,67 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2009 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 "pointer-group-interface.hh" #include "rest.hh" -#include "group-interface.hh" +#include "rhythmic-head.hh" #include "staff-symbol-referencer.hh" -#include "duration.hh" -#include "directional-element-interface.hh" +#include "stem.hh" +#include "grob.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); - Axis a = (Axis) scm_to_int (axis); - assert (a == Y_AXIS); - + Grob *them = unsmob_grob (smob); if (Note_column::has_rests (them)) { - Grob *rc = unsmob_grob (them->get_property ("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_make_real (0.0); + return scm_from_double (0.0); } -MAKE_SCHEME_CALLBACK (Rest_collision, force_shift_callback_rest, 2); +MAKE_SCHEME_CALLBACK_WITH_OPTARGS (Rest_collision, force_shift_callback_rest, 2, 1, ""); 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. + */ + if (scm_is_number (offset)) + 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_make_real (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 +72,14 @@ Rest_collision::add_column (Grob *me, Grob *p) (not?) */ - p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); - p->set_property ("rest-collision", me->self_scm ()); + 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_property ("rest")); + 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,30 +87,26 @@ 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) { - SCM elts = me->get_property ("elements"); + Grob *me = unsmob_grob (smob); + + me->set_property ("positioning-done", SCM_BOOL_T); - Link_array rests; - Link_array notes; + extract_grob_set (me, "elements", elts); - for (SCM s = elts; scm_is_pair (s); s = scm_cdr (s)) + vector rests; + vector notes; + + for (vsize i = 0; i < elts.size (); i++) { - 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); - } + Grob *e = elts[i]; + if (unsmob_grob (e->get_object ("rest"))) + rests.push_back (e); else - notes.push (e); + notes.push_back (e); } /* @@ -120,7 +120,7 @@ Rest_collision::do_shift (Grob *me) no partners to collide with */ if (rests.size () + notes.size () < 2) - return SCM_UNSPECIFIED; + return SCM_BOOL_T; Real staff_space = Staff_symbol_referencer::staff_space (me); /* @@ -133,26 +133,23 @@ 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 (_ ("rest direction not set. Cannot resolve collision.")); + rests[d]->warning (_ ("cannot resolve rest collision: rest direction not set")); } Direction d = LEFT; do - { - ordered_rests[d].sort (Note_column::shift_compare); - } - while (flip (&d) != LEFT); + vector_sort (ordered_rests[d], Note_column::shift_less); + while (flip (&d) != LEFT) + ; do { @@ -161,7 +158,7 @@ Rest_collision::do_shift (Grob *me) if (ordered_rests[-d].size () > 1) ordered_rests[-d][0]->warning (_ ("too many colliding rests")); - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } } while (flip (&d) != LEFT); @@ -170,23 +167,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]; @@ -204,40 +201,54 @@ Rest_collision::do_shift (Grob *me) Rests and notes. */ if (rests.size () > 1) - { - warning (_ ("too many colliding rests")); - } + warning (_ ("too many colliding rests")); 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]); rcol = rests[i]; + dir = Note_column::dir (rcol); } if (!rcol) - return SCM_UNSPECIFIED; + return SCM_BOOL_T; + Grob *rest = Note_column::get_rest (rcol); Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); Interval restdim = rcol->extent (common, Y_AXIS); if (restdim.is_empty ()) - return SCM_UNSPECIFIED; + return SCM_BOOL_T; Real staff_space = Staff_symbol_referencer::staff_space (rcol); 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)); + if (Note_column::dir (notes[i]) == -dir) + { + /* try not to look at the stem, as looking at a beamed + note may trigger beam positioning prematurely. + + This happens with dotted rests, which need Y + positioning to compute X-positioning. + */ + Grob *head = Note_column::first_head (notes[i]); + if (head) + notedim.unite (head->extent (common, Y_AXIS)); + else + programming_error ("Note_column without first_head()"); + } + else + notedim.unite (notes[i]->extent (common, Y_AXIS)); } - Real dist - = minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0; - + Real y = dir * max (0.0, + -dir * restdim[-dir] + dir * notedim[dir] + minimum_dist); + int stafflines = Staff_symbol_referencer::line_count (me); if (!stafflines) { @@ -246,19 +257,27 @@ Rest_collision::do_shift (Grob *me) } // move discretely by half spaces. - int discrete_dist = int (ceil (dist / (0.5 * staff_space))); + int discrete_y = dir * int (ceil (y / (0.5 * dir * staff_space))); // move by whole spaces inside the staff. - if (discrete_dist < stafflines + 1) - discrete_dist = int (ceil (discrete_dist / 2.0) * 2.0); + if (fabs (Staff_symbol_referencer::get_position (rest) + + discrete_y) < stafflines + 1) + { + discrete_y = dir * int (ceil (dir * discrete_y / 2.0) * 2.0); + } - Note_column::translate_rests (rcol, dir * discrete_dist); + Note_column::translate_rests (rcol, discrete_y); } - return SCM_UNSPECIFIED; + return SCM_BOOL_T; } -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, + "Move around ordinary rests (not multi-measure-rests) to avoid" + " conflicts.", + + /* properties */ + "minimum-distance " + "positioning-done " + "elements " + );