X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=f791015c8fa3211202213da28ca31f81d3865bb2;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=b09bf842585def0e1d08f0eda3798e86383b38b7;hpb=7249d131a7b58117ad502f17975af50ea4144a05;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index b09bf84258..f791015c8f 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include // ceil. @@ -19,23 +19,23 @@ #include "staff-symbol-referencer.hh" #include "duration.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) { - Score_element *them = unsmob_element (element_smob); + Grob *them = unsmob_grob (element_smob); Axis a = (Axis) gh_scm2int (axis); assert (a == Y_AXIS); - Score_element * rc = unsmob_element (them->get_elt_property ("rest-collision")); + Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision")); if (rc) { /* Done: destruct pointers, so we do the shift only once. */ - SCM elts = rc->get_elt_property ("elements"); - rc->set_elt_property ("elements", SCM_EOL); + SCM elts = rc->get_grob_property ("elements"); + rc->set_grob_property ("elements", SCM_EOL); do_shift (rc, elts); } @@ -44,13 +44,18 @@ Rest_collision::force_shift_callback (SCM element_smob, SCM axis) } void -Rest_collision::add_column (Score_element*me,Score_element *p) +Rest_collision::add_column (Grob*me,Grob *p) { me->add_dependency (p); - Pointer_group_interface::add_element (me, "elements", 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_elt_property ("rest-collision", me->self_scm ()); + p->set_grob_property ("rest-collision", me->self_scm ()); } @@ -58,33 +63,46 @@ Rest_collision::add_column (Score_element*me,Score_element *p) Combination of dot-count and duration-log. */ static SCM -head_characteristic (Score_element * col) +head_characteristic (Grob * col) { - Score_element * s = unsmob_element (col->get_elt_property ("rest")); + Grob * s = unsmob_grob (col->get_grob_property ("rest")); if (!s) return SCM_BOOL_F; else - return gh_cons (s->get_elt_property ("duration-log"), + return gh_cons (s->get_grob_property ("duration-log"), gh_int2scm (Rhythmic_head::dot_count (s))); } /* 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 (Score_element *me, SCM elts) +Rest_collision::do_shift (Grob *me, SCM elts) { /* ugh. -> score elt type */ - Link_array rests; - Link_array notes; - - for (SCM s = elts; gh_pair_p (s); s = gh_cdr (s)) + Link_array rests; + Link_array notes; + Grob * commony = 0; + for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s)) { - Score_element * e = unsmob_element (gh_car (s)); - if (e && unsmob_element (e->get_elt_property ("rest"))) + + Grob * e = unsmob_grob (ly_car (s)); + if (!e) + continue; + + if (!commony) + commony = e; + else + commony= commony->common_refpoint (e, Y_AXIS); + + if (unsmob_grob (e->get_grob_property ("rest"))) rests.push (e); else notes.push (e); @@ -101,21 +119,21 @@ Rest_collision::do_shift (Score_element *me, SCM elts) */ // no rests to collide - if (!rests.size()) + if (!rests.size ()) return SCM_UNSPECIFIED; // no partners to collide with - if (rests.size() + notes.size () < 2) + if (rests.size () + notes.size () < 2) return SCM_UNSPECIFIED; // meisjes met meisjes - if (!notes.size()) + if (!notes.size ()) { - SCM characteristic = head_characteristic (rests[0]); + SCM characteristic = head_characteristic (rests[0]); int i = 1; for (; i < rests.size (); i++) { - if (!gh_equal_p (head_characteristic (rests[i]), characteristic)) + if (!gh_equal_p (head_characteristic (rests[i]), characteristic)) break; } @@ -123,17 +141,17 @@ Rest_collision::do_shift (Score_element *me, SCM elts) 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). + (urg: all 3 of them, currently). */ int display_count; - SCM s = me->get_elt_property ("maximum-rest-count"); + SCM s = me->get_grob_property ("maximum-rest-count"); if (i == rests.size () && gh_number_p (s) && gh_scm2int (s) < rests.size ()) { display_count = gh_scm2int (s); for (; i > display_count; i--) { - Score_element* r = unsmob_element (rests[i-1]->get_elt_property ("rest")); + Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest")); if (r) r->suicide (); rests[i-1]->suicide (); @@ -173,36 +191,37 @@ Rest_collision::do_shift (Score_element *me, SCM elts) { if (rests.size () > 1) { - warning (_("too many colliding rests")); + warning (_ ("too many colliding rests")); } if (notes.size () > 1) { - warning (_("too many notes for rest collision")); + warning (_ ("too many notes for rest collision")); } - Score_element * rcol = rests[0]; + Grob * rcol = rests[0]; // try to be opposite of noteheads. Direction dir = - Note_column::dir (notes[0]); - Interval restdim = Note_column::rest_dim (rcol); + Grob * r = unsmob_grob (rcol->get_grob_property ("rest")); + Interval restdim = r->extent (r, Y_AXIS); // ?? + if (restdim.empty_b ()) return SCM_UNSPECIFIED; - // staff ref'd? - Real staff_space = me->paper_l()->get_var ("staffspace"); + // FIXME: staff ref'd? + Real staff_space = 1.0; - /* FIXME - staff_space = rcol->rests[0]->staff_space (); - */ - Real minimum_dist = gh_scm2double (me->get_elt_property ("minimum-distance")) * staff_space; + Real minimum_dist = gh_scm2double (me->get_grob_property ("minimum-distance")) * staff_space; /* assumption: ref points are the same. */ Interval notedim; - for (int i = 0; i < notes.size(); i++) + for (int i = 0; i < notes.size (); i++) { - notedim.unite (notes[i]->extent (notes[i],Y_AXIS)); // refp? + Grob * stem = Note_column::stem_l (notes[i]); + Grob * head = Stem::first_head (stem); + notedim.unite (head->extent (commony, Y_AXIS)); } Interval inter (notedim); @@ -231,7 +250,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts) } void -Rest_collision::set_interface (Score_element*me) +Rest_collision::set_interface (Grob*me) { me->set_extent_callback (SCM_EOL, X_AXIS); me->set_extent_callback (SCM_EOL, Y_AXIS);