X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=f791015c8fa3211202213da28ca31f81d3865bb2;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=69f1ff0eed4e832dfb3455b3e5d9e7c88bdac5f1;hpb=fdfd147f1233eef6ea8b176290221b5a4ec38868;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 69f1ff0eed..f791015c8f 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,105 +3,109 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ + #include // ceil. #include "debug.hh" #include "rest-collision.hh" #include "note-column.hh" #include "stem.hh" -#include "note-head.hh" +#include "rhythmic-head.hh" #include "paper-def.hh" #include "rest.hh" #include "group-interface.hh" #include "staff-symbol-referencer.hh" #include "duration.hh" -Real -Rest_collision::force_shift_callback (Score_element const*them, Axis a) +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); assert (a == Y_AXIS); - Score_element * rc = unsmob_element (them->get_elt_pointer ("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_pointer ("elements"); - rc->set_elt_pointer ("elements", SCM_EOL); + SCM elts = rc->get_grob_property ("elements"); + rc->set_grob_property ("elements", SCM_EOL); do_shift (rc, elts); } - return 0.0; + return gh_double2scm (0.0); } void -Rest_collision::add_column (Note_column *p) +Rest_collision::add_column (Grob*me,Grob *p) { - elt_l_->add_dependency (p); - Pointer_group_interface gi (elt_l_); - gi.add_element (p); + me->add_dependency (p); + Pointer_group_interface::add_grob (me, ly_symbol2scm ("elements"), p); - p->add_offset_callback (&Rest_collision::force_shift_callback, Y_AXIS); - p->set_elt_pointer ("rest-collision", elt_l_->self_scm_); -} + /* + only add callback for the rests, since we don't move anything else. -/* - these 3 have to go, because they're unnecessary complications. - */ -static Duration -to_duration (int type, int dots) -{ - Duration d; - d.durlog_i_ = type; - d.dots_i_ = dots; - return d; + (not?) + */ + p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); + p->set_grob_property ("rest-collision", me->self_scm ()); } -/* - UGH - - elt_l_ should be "duration" independent - */ -static Moment -rhythmic_head2mom (Rhythmic_head* r) -{ - return to_duration (r->balltype_i (), r->dot_count ()).length_mom (); -} /* - ugh + Combination of dot-count and duration-log. */ -static Rhythmic_head* -col2rhythmic_head (Score_element* c) +static SCM +head_characteristic (Grob * col) { - return dynamic_cast (unsmob_element (c->get_elt_pointer ("rest"))); -} + 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))); +} /* 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_pointer ("rest"))) - rests.push (dynamic_cast (e)); + + Grob * e = unsmob_grob (ly_car (s)); + if (!e) + continue; + + if (!commony) + commony = e; else - notes.push (dynamic_cast (e)); + commony= commony->common_refpoint (e, Y_AXIS); + + if (unsmob_grob (e->get_grob_property ("rest"))) + rests.push (e); + else + notes.push (e); } @@ -115,22 +119,21 @@ Rest_collision::do_shift (Score_element *me, SCM elts) */ // no rests to collide - if (!rests.size()) - return SCM_UNDEFINED; + if (!rests.size ()) + return SCM_UNSPECIFIED; // no partners to collide with - if (rests.size() + notes.size () < 2) - return SCM_UNDEFINED; + if (rests.size () + notes.size () < 2) + return SCM_UNSPECIFIED; // meisjes met meisjes - if (!notes.size()) + if (!notes.size ()) { - Moment m = rhythmic_head2mom (col2rhythmic_head (rests[0])); + SCM characteristic = head_characteristic (rests[0]); int i = 1; for (; i < rests.size (); i++) { - Moment me = rhythmic_head2mom (col2rhythmic_head (rests[i])); - if (me != m) + if (!gh_equal_p (head_characteristic (rests[i]), characteristic)) break; } @@ -138,29 +141,49 @@ 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--) - col2rhythmic_head (rests[i-1]) - ->set_elt_property ("molecule-callback", SCM_BOOL_T); + { + Grob* r = unsmob_grob (rests[i-1]->get_grob_property ("rest")); + if (r) + r->suicide (); + rests[i-1]->suicide (); + } } else display_count = rests.size (); /* - UGH. Should get dims from table. Should have minimum dist. + Ugh. Should have minimum dist. + + Ugh. What do we do if we have three different rests? + */ - int dy = display_count > 2 ? 6 : 4; + int dy = display_count > 2 ? 6 : 4; // FIXME Should get dims from table. if (display_count > 1) { - rests[0]->translate_rests (dy); - rests[1]->translate_rests (-dy); + 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); } } // meisjes met jongetjes @@ -168,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")); } - Note_column * rcol = rests[0]; + Grob * rcol = rests[0]; // try to be opposite of noteheads. - Direction dir = - notes[0]->dir(); + Direction dir = - Note_column::dir (notes[0]); + + Grob * r = unsmob_grob (rcol->get_grob_property ("rest")); + Interval restdim = r->extent (r, Y_AXIS); // ?? - Interval restdim = rcol->rest_dim (); if (restdim.empty_b ()) - return SCM_UNDEFINED; + return SCM_UNSPECIFIED; - // staff ref'd? - Real staff_space = me->paper_l()->get_var ("interline"); + // 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 (Y_AXIS)); + Grob * stem = Note_column::stem_l (notes[i]); + Grob * head = Stem::first_head (stem); + notedim.unite (head->extent (commony, Y_AXIS)); } Interval inter (notedim); @@ -209,7 +233,7 @@ Rest_collision::do_shift (Score_element *me, SCM elts) // FIXME //int stafflines = 5; // rcol->rests[0]->line_count; - int stafflines = Staff_symbol_referencer_interface (me).line_count (); + int stafflines = Staff_symbol_referencer::line_count (me); // hurg? stafflines = stafflines != 0 ? stafflines : 5; @@ -220,20 +244,15 @@ Rest_collision::do_shift (Score_element *me, SCM elts) 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_UNDEFINED; + return SCM_UNSPECIFIED; } void -Rest_collision::set_interface () +Rest_collision::set_interface (Grob*me) { - elt_l_->set_extent_callback (0, X_AXIS); - elt_l_->set_extent_callback (0, Y_AXIS); - elt_l_->set_elt_pointer ("elements", SCM_EOL); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS); } -Rest_collision::Rest_collision (Score_element* c) -{ - elt_l_ = c; -}