X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=f791015c8fa3211202213da28ca31f81d3865bb2;hb=d9b43b93f2c885409bafdb157138158f65cc49aa;hp=8dd85f8a4b9283132859453fc5ff5fa668a23076;hpb=01d84d552854fb399bd0e819502c6c2db2a1b214;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 8dd85f8a4b..f791015c8f 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,40 +3,111 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ -#include "beam.hh" + +#include // ceil. + #include "debug.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" -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) + { + /* + Done: destruct pointers, so we do the shift only once. + */ + SCM elts = rc->get_grob_property ("elements"); + rc->set_grob_property ("elements", SCM_EOL); + + do_shift (rc, elts); + } - gi.add_element (nc_l); + return gh_double2scm (0.0); } void -Rest_collision::do_pre_processing() +Rest_collision::add_column (Grob*me,Grob *p) { - 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"); - + 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 ()); +} + + +/* + Combination of dot-count and duration-log. + */ +static SCM +head_characteristic (Grob * col) +{ + 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 (Grob *me, SCM elts) +{ + /* + ugh. -> score elt type + */ + Link_array rests; + Link_array notes; + Grob * commony = 0; + for (SCM s = elts; gh_pair_p (s); s = ly_cdr (s)) + { + + 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); + } + /* handle rest-rest and rest-note collisions @@ -48,61 +119,109 @@ Rest_collision::do_pre_processing() */ // no rests to collide - if (!rest_l_arr.size()) - return; + if (!rests.size ()) + return SCM_UNSPECIFIED; // no partners to collide with - if (rest_l_arr.size() + ncol_l_arr.size () < 2) - return; + if (rests.size () + notes.size () < 2) + return SCM_UNSPECIFIED; // meisjes met meisjes - if (!ncol_l_arr.size()) + if (!notes.size ()) { + SCM characteristic = head_characteristic (rests[0]); + int i = 1; + for (; i < rests.size (); i++) + { + if (!gh_equal_p (head_characteristic (rests[i]), characteristic)) + break; + } + /* - UGH. Should get dims from table. Should have minimum dist. + 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 dy = rest_l_arr.size() > 2 ? 6 : 4; + int display_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--) + { + 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 have minimum dist. + + Ugh. What do we do if we have three different rests? - rest_l_arr[0]->translate_rests (rest_l_arr[0]->dir () *dy); - rest_l_arr.top()->translate_rests (rest_l_arr.top ()->dir ()* dy); + */ + int dy = display_count > 2 ? 6 : 4; // FIXME Should get dims from table. + if (display_count > 1) + { + 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 else { - if (rest_l_arr.size () > 1) + if (rests.size () > 1) { - warning (_("too many colliding rests")); + warning (_ ("too many colliding rests")); } - if (ncol_l_arr.size () > 1) + if (notes.size () > 1) { - warning (_("too many notes for rest collision")); + warning (_ ("too many notes for rest collision")); } - Note_column * rcol = rest_l_arr[0]; + Grob * rcol = rests[0]; // try to be opposite of noteheads. - Direction dir = - ncol_l_arr[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; + return SCM_UNSPECIFIED; - // staff ref'd? - Real staff_space = paper_l()->get_var ("interline"); - - /* FIXME - staff_space = rcol->rest_l_arr[0]->staff_line_leading_f (); - */ - Real internote_f = staff_space/2; - Real minimum_dist = paper_l ()->get_var ("restcollision_minimum_dist") - * internote_f; + // FIXME: staff ref'd? + Real staff_space = 1.0; + + 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 < ncol_l_arr.size(); i++) + for (int i = 0; i < notes.size (); i++) { - notedim.unite (ncol_l_arr[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); @@ -113,8 +232,10 @@ Rest_collision::do_pre_processing() // FIXME - int stafflines = 5; // rcol->rest_l_arr[0]->lines_i (); - + //int stafflines = 5; // rcol->rests[0]->line_count; + int stafflines = Staff_symbol_referencer::line_count (me); + // hurg? + stafflines = stafflines != 0 ? stafflines : 5; // move discretely by half spaces. int discrete_dist = int (ceil (dist / (0.5 *staff_space))); @@ -123,17 +244,15 @@ Rest_collision::do_pre_processing() 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() +void +Rest_collision::set_interface (Grob*me) { - 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); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS); }