X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frest-collision.cc;h=e81cef84953cfd6474c1c564b72aa7e314b590ef;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=38d393f16091b54ecc5dc577df2b9eb3966771f6;hpb=59ed0cee2aae58a3f0483f21261c68aee406fa10;p=lilypond.git diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index 38d393f160..e81cef8495 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,149 +3,256 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ +#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" +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); -IMPLEMENT_IS_TYPE_B1(Rest_collision,Item); + Grob * rc = unsmob_grob (them->get_grob_property ("rest-collision")); -void -Rest_collision::add_column (Note_column *nc_l) -{ - add_dependency (nc_l); - if (nc_l->rest_b ()) - rest_l_arr_.push (nc_l); - else - ncol_l_arr_.push (nc_l); + 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); + } + + return gh_double2scm (0.0); } void -Rest_collision::do_post_processing() +Rest_collision::add_column (Grob*me,Grob *p) { + me->add_dependency (p); + Pointer_group_interface::add_element (me, "elements", p); + /* - handle rest under beam (do_post: beams are calculated now) + only add callback for the rests, since we don't move anything else. - [todo] - i-d like to have access to the beam itself, - iso only the (half-initialised?) stem + (not?) + */ + p->add_offset_callback (Rest_collision::force_shift_callback_proc, Y_AXIS); + p->set_grob_property ("rest-collision", me->self_scm ()); +} - what about combination of collisions and rest under beam - */ - // no rests to collide - if (!rest_l_arr_.size()) - return; - // can this happen? - Stem* stem_l = rest_l_arr_[0]->stem_l_; - if (!stem_l) - return; - // no beam - if (!(stem_l->beams_left_i_ || stem_l->beams_right_i_)) - return; - - int dir_i = rest_l_arr_[0]->dir_; - int midpos = 4; - // ugh - int stem_length_i = 7 - 2; - // ugh, Stem::stem_start vs Stem::stem_end - int pos = (int)(stem_l->stem_end_f() - midpos) - dir_i * stem_length_i; - /* - nogo: stem_start not set for rests? - int pos = (stem_l->stem_begin_f() - midpos) + dir_i * 2; +/* + Combination of dot-count and duration-log. + */ +static SCM +head_characteristic (Grob * col) +{ + Grob * s = unsmob_grob (col->get_grob_property ("rest")); - WHY IS THIS STILL HERE? --hwn - */ - rest_l_arr_[0]->translate_rests (pos); + 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::do_pre_processing() +/* + 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 [todo] - decide not to print rest if too crowded? + * decide not to print rest if too crowded? + + * ignore rests under beams. */ // 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 ()) { - int dy = rest_l_arr_.size() > 2 ? 6 : 4; + SCM characteristic = head_characteristic (rests[0]); + int i = 1; + for (; i < rests.size (); i++) + { + if (!gh_equal_p (head_characteristic (rests[i]), characteristic)) + break; + } + + /* + 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 = 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); - // top is last element... - 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 { - // int dir_i = - ncol_l_arr_[0]->dir_; - int dir_i = rest_l_arr_[0]->dir_; - // hope it's 4: if it works->doco - int midpos = 0; - - // minimum move - int minpos = 4; - - // quart rest height - // UGH Should get dims from table! - int size_i = 6; - - int sep_i = 3 + size_i / 2; - for (int i = 0; i < ncol_l_arr_.size(); i++) + if (rests.size () > 1) { - // how to know whether to sort? - ncol_l_arr_[i]->sort(); - for (int j = 0; j < ncol_l_arr_[i]->head_l_arr_.size(); j++) - minpos = minpos >? dir_i * - (ncol_l_arr_[i]->head_l_arr_[j]->position_i_ -midpos) + sep_i; + warning (_ ("too many colliding rests")); } - rest_l_arr_[0]->translate_rests (dir_i * minpos); - } -} + if (notes.size () > 1) + { + warning (_ ("too many notes for rest collision")); + } + Grob * rcol = rests[0]; -void -Rest_collision::do_print() const -{ -#ifndef NPRINT - DOUT << "rests: " << rest_l_arr_.size() << ", "; - DOUT << "cols: " << ncol_l_arr_.size(); -#endif -} + // try to be opposite of noteheads. + Direction dir = - Note_column::dir (notes[0]); -void -Rest_collision::do_substitute_dependency (Score_element*o,Score_element*n) -{ - Item*o_l = o->access_Item (); - + Grob * r = unsmob_grob (rcol->get_grob_property ("rest")); + Interval restdim = r->extent (r, Y_AXIS); // ?? - if (o_l&&o_l->is_type_b (Note_column::static_name ())) - { - Note_column *n_l = n?(Note_column*)n->access_Item ():0; - rest_l_arr_.substitute ((Note_column*)o_l, n_l); - ncol_l_arr_.substitute ((Note_column*)o_l, n_l); + if (restdim.empty_b ()) + return SCM_UNSPECIFIED; + + // 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 < notes.size (); i++) + { + Grob * stem = Note_column::stem_l (notes[i]); + Grob * head = Stem::first_head (stem); + notedim.unite (head->extent (commony, Y_AXIS)); + } + + Interval inter (notedim); + inter.intersect (restdim); + + Real dist = + minimum_dist + dir * (notedim[dir] - restdim[-dir]) >? 0; + + + // FIXME + //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))); + + // move by whole spaces inside the staff. + if (discrete_dist < stafflines+1) + discrete_dist = int (ceil (discrete_dist / 2.0)* 2.0); + + Note_column::translate_rests (rcol,dir * discrete_dist); } + return SCM_UNSPECIFIED; } -Rest_collision::Rest_collision() +void +Rest_collision::set_interface (Grob*me) { - transparent_b_ = true; - set_empty (true); + me->set_extent_callback (SCM_EOL, X_AXIS); + me->set_extent_callback (SCM_EOL, Y_AXIS); } +