X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=25b7636dfa1b3664a227bf6072e2409bed83ba56;hb=c484fb1da7751d35734194e623cb823b559e190f;hp=2dd7aa890b6219a6530fe4ca384875664a88455c;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 2dd7aa890b..25b7636dfa 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,194 +3,235 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ + #include // ceil. -#include "beam.hh" -#include "debug.hh" +#include "warn.hh" #include "rest-collision.hh" #include "note-column.hh" #include "stem.hh" -#include "note-head.hh" -#include "collision.hh" +#include "rhythmic-head.hh" #include "paper-def.hh" #include "rest.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "duration.hh" +#include "directional-element-interface.hh" -void -Rest_collision::add_column (Note_column *nc_l) +MAKE_SCHEME_CALLBACK (Rest_collision,force_shift_callback,2); +SCM +Rest_collision::force_shift_callback (SCM element_smob, SCM axis) { - add_dependency (nc_l); - Group_interface gi (this); - if (nc_l->rest_b ()) - gi.name_ = "rests"; - else - gi.name_ = "notes"; + Grob *them = unsmob_grob (element_smob); + Axis a = (Axis) gh_scm2int (axis); + assert (a == Y_AXIS); + + Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision")); + + if (rc && !to_boolean (rc->get_grob_property ("positioning-done"))) + { + rc->set_grob_property ("positioning-done", SCM_BOOL_T); + + do_shift (rc); + } - gi.add_element (nc_l); + return gh_double2scm (0.0); } -static Duration -to_duration (int type, int dots) -{ - Duration d; - d.durlog_i_ = type; - d.dots_i_ = dots; - return d; -} -static Moment -rhythmic_head2mom (Rhythmic_head* r) + +void +Rest_collision::add_column (Grob*me,Grob *p) { - return to_duration (r->balltype_i (), r->dot_count ()).length_mom (); + me->add_dependency (p); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p); + + /* + only add callback for the rests, since we don't move anything + else. + + (not?) + */ + p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); + p->set_grob_property ("rest-collision", me->self_scm ()); } -static Rhythmic_head* -col2rhythmic_head (Note_column* c) + +/* + Combination of dot-count and duration-log. + */ +static SCM +head_characteristic (Grob * col) { - SCM s = c->get_elt_property ("rests"); - assert (gh_pair_p (s)); - Score_element* e = unsmob_element (gh_car (s)); - return dynamic_cast (e); + 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))); } -void -Rest_collision::before_line_breaking () +/* + 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 +Rest_collision::do_shift (Grob *me) { - Link_array rest_l_arr = - Group_interface__extract_elements (this, (Note_column*) 0, "rests"); - Link_array ncol_l_arr = - Group_interface__extract_elements (this, (Note_column*) 0, "notes"); - + SCM elts = me->get_grob_property ("elements"); + + Link_array rests; + Link_array notes; + + for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s)) + { + Grob * e = unsmob_grob (ly_car (s)); + if (unsmob_grob (e->get_grob_property ("rest"))) + { + /* + Ignore rests under beam. + */ + Grob* st = unsmob_grob (e->get_grob_property ("stem")); + if (st && unsmob_grob (st->get_grob_property ("beam"))) + continue; + + rests.push (e); + } + else + notes.push (e); + } + /* handle rest-rest and rest-note collisions [todo] * decide not to print rest if too crowded? - - * ignore rests under beams. */ - // no rests to collide - if (!rest_l_arr.size()) - return; + /* + no partners to collide with + */ + if (rests.size () + notes.size () < 2) + return SCM_UNSPECIFIED; - // no partners to collide with - if (rest_l_arr.size() + ncol_l_arr.size () < 2) - return; - // meisjes met meisjes - if (!ncol_l_arr.size()) + Real staff_space = Staff_symbol_referencer::staff_space (me); + /* + only rests + */ + if (!notes.size ()) { /* - Oeps, nu zie ik 't pas: colommen met noten. - Het commentaar, dat ik ooit geschreven had: meisjes met meisjes, - is achterhaald: urg. - + This is incomplete: in case of an uneven number of rests, the + center one should be centered on the staff. */ - - Moment m = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[0])); - int i = 1; - for (; i < rest_l_arr.size (); i++) + Drul_array< Link_array > ordered_rests; + for (int i= 0; i < rests.size (); i++) { - Moment me = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[i])); - if (me != m) - break; + Grob * r = Note_column::get_rest (rests[i]); + + Direction d = get_grob_direction (r); + if (d) + { + ordered_rests[d].push (rests[i]); + } + else + rests[d]->warning (_("rest direction not set. Cannot resolve collision.")); } - /* - 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). - */ - int display_count; - SCM s = get_elt_property ("maximum-rest-count"); - if (i == rest_l_arr.size () - && gh_number_p (s) && gh_int2scm (s) < rest_l_arr.size ()) - { - display_count = gh_int2scm (s); -#if 0 - /* - Setting surplus rests to transparent. - Only really necessary for maximum-rest-count == 0, - because rests wil be set at exact the same position - and thus overlap. - */ - for (i--;i > display_count; i--) - col2rhythmic_head (rest_l_arr[i-1]) - ->set_elt_property ("transparent", SCM_BOOL_T); -#endif - } - else - display_count = rest_l_arr.size (); + Direction d = LEFT; + do { + ordered_rests[d].sort (Note_column::shift_compare); + } while (flip (&d) != LEFT); - /* - UGH. Should get dims from table. Should have minimum dist. - */ - int dy = display_count > 2 ? 6 : 4; - if (display_count > 1) + if (ordered_rests[UP].size () + ordered_rests[DOWN].size () < 2) + return SCM_UNSPECIFIED; + + 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) { - rest_l_arr[0]->translate_rests (dy); - rest_l_arr[1]->translate_rests (-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 { - if (rest_l_arr.size () > 1) - { - warning (_("too many colliding rests")); - } - if (ncol_l_arr.size () > 1) + /* + Rests and notes. + */ + if (rests.size () > 1) { - warning (_("too many notes for rest collision")); + warning (_ ("too many colliding rests")); } - Note_column * rcol = rest_l_arr[0]; - - // try to be opposite of noteheads. - Direction dir = - ncol_l_arr[0]->dir(); - - Interval restdim = rcol->rest_dim (); - if (restdim.empty_b ()) - return; + Grob * rcol = 0; + Direction dir = CENTER; + + 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; - // staff ref'd? - Real staff_space = paper_l()->get_var ("interline"); - - /* FIXME - staff_space = rcol->rest_l_arr[0]->staff_space (); - */ - Real half_staff_space_f = staff_space/2; - Real minimum_dist = paper_l ()->get_var ("restcollision_minimum_dist") - * half_staff_space_f; + Grob *common = common_refpoint_of_array (notes, rcol, Y_AXIS); - /* - assumption: ref points are the same. - */ + 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 = robust_scm2double (me->get_grob_property ("minimum-distance"), 1.0) * staff_space; + Interval notedim; - for (int i = 0; i < ncol_l_arr.size(); i++) + for (int i = 0; i < notes.size (); i++) { - notedim.unite (ncol_l_arr[i]->extent (Y_AXIS)); + notedim.unite (notes[i]->extent (common, Y_AXIS)); } - Interval inter (notedim); - inter.intersect (restdim); - Real dist = minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0; - - // FIXME - //int stafflines = 5; // rcol->rest_l_arr[0]->line_count; - int stafflines = Staff_symbol_referencer_interface (this).line_count (); - // hurg? - stafflines = stafflines != 0 ? stafflines : 5; + int stafflines = Staff_symbol_referencer::line_count (me); + if (!stafflines) + { + programming_error ("No staff line count ? "); + stafflines =5; + } // move discretely by half spaces. int discrete_dist = int (ceil (dist / (0.5 *staff_space))); @@ -198,18 +239,15 @@ Rest_collision::before_line_breaking () // move by whole spaces inside the staff. if (discrete_dist < stafflines+1) discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); - - rcol->translate_rests (dir * discrete_dist); + + Note_column::translate_rests (rcol,dir * discrete_dist); } + return SCM_UNSPECIFIED; } -Rest_collision::Rest_collision() -{ - set_elt_property ("rests", SCM_EOL); - set_elt_property ("notes", SCM_EOL); - set_elt_property ("transparent", SCM_BOOL_T); - set_empty (X_AXIS); - set_empty (Y_AXIS); -} +ADD_INTERFACE (Rest_collision,"rest-collision-interface", + "Move around ordinary rests (not multi-measure-rests) to avoid " +"conflicts.", + "maximum-rest-count minimum-distance positioning-done elements");