X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-collision.cc;h=3da3de58c95234d1ab52efb57a5d286b631558e2;hb=a1ac6142347beea8db846898b777b0e67cf9f83f;hp=5468ff529f71e2c095259e70625f90de6ee50cb7;hpb=3db71772f5cb820c233448af50042872d065647f;p=lilypond.git diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 5468ff529f..3da3de58c9 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -1,13 +1,14 @@ - /* collision.cc -- implement Collision source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2004 Han-Wen Nienhuys */ -#include "debug.hh" +#include + +#include "warn.hh" #include "note-collision.hh" #include "note-column.hh" #include "note-head.hh" @@ -16,6 +17,8 @@ #include "axis-group-interface.hh" #include "item.hh" #include "stem.hh" +#include "side-position-interface.hh" +#include "dot-column.hh" MAKE_SCHEME_CALLBACK (Note_collision_interface,force_shift_callback,2); @@ -28,9 +31,9 @@ Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis) me = me->get_parent (a); - if (! to_boolean (me->get_grob_property ("collision-done"))) + if (! to_boolean (me->get_property ("positioning-done"))) { - me->set_grob_property ("collision-done", SCM_BOOL_T); + me->set_property ("positioning-done", SCM_BOOL_T); do_shifts (me); } @@ -39,23 +42,70 @@ Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis) void -check_meshing_chords (Grob*me, +check_meshing_chords (Grob *me, Drul_array< Array < Real > > *offsets, Drul_array< Array < Slice > > const &extents, Drul_array > const &clash_groups) { if (!extents[UP].size () || ! extents[DOWN].size ()) - return ; + return; + + Grob *cu = clash_groups[UP][0]; + Grob *cd = clash_groups[DOWN][0]; + + /* Every note column should have a stem, but avoid a crash. */ + if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd)) + return; + + Grob *nu = Note_column::first_head (cu); + Grob *nd = Note_column::first_head (cd); + + Array ups = Stem::note_head_positions (Note_column::get_stem (cu)); + Array dps = Stem::note_head_positions (Note_column::get_stem (cd)); + + /* Too far apart to collide. */ + if (ups[0] > dps.top () + 1) + return; + + // FIXME: what's this? + bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ()); + + + + /* Do not merge notes typeset in different style. */ + if ( !gh_equal_p (nu->get_property ("style"), + nd->get_property ("style") ) ) + merge_possible = false; + int upball_type = Note_head::get_balltype (nu); + int dnball_type = Note_head::get_balltype (nd); - Grob *cu =clash_groups[UP][0]; - Grob *cd =clash_groups[DOWN][0]; + /* Do not merge whole notes (or longer, like breve, longa, maxima). */ + if (merge_possible && (upball_type <= 0 || dnball_type <= 0)) + merge_possible = false; + + if (merge_possible + && Rhythmic_head::dot_count (nu) != Rhythmic_head::dot_count (nd) + && !to_boolean (me->get_property ("merge-differently-dotted"))) + merge_possible = false; + + /* Can only merge different heads if merge-differently-headed is + set. */ + if (merge_possible + && upball_type != dnball_type + && !to_boolean (me->get_property ("merge-differently-headed"))) + merge_possible = false; + + /* Should never merge quarter and half notes, as this would make + them indistinguishable. */ + if (merge_possible + && ((Rhythmic_head::duration_log (nu) == 1 + && Rhythmic_head::duration_log (nd) == 2) + || (Rhythmic_head::duration_log (nu) == 2 + && Rhythmic_head::duration_log (nd) == 1))) + merge_possible = false; - Grob * nu_l= Note_column::first_head (cu); - Grob * nd_l = Note_column::first_head (cd); - - /* this case (distant half collide), @@ -76,71 +126,19 @@ check_meshing_chords (Grob*me, */ - bool close_half_collide = false; - bool distant_half_collide = false; - bool full_collide = false; - - /* - Let's not crash. - */ - if (!Note_column::stem_l (cu) - || !Note_column::stem_l (cd)) - return ; - - - /* - TODO: - - filter out the 'o's in this configuration, since they're no part - in the collision. + /* TODO: filter out the 'o's in this configuration, since they're no + part in the collision. | x|o x|o x - */ - Array ups = Stem::note_head_positions (Note_column::stem_l (cu)); - Array dps = Stem::note_head_positions (Note_column::stem_l (cd)); - - /* - they're too far apart to collide. - - */ - - if (ups[0] > dps.top () + 1) - return ; - - bool touch = (ups[0] - dps.top () >= 0); - bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ()); - - /* - don't merge whole notes (or longer, like breve, longa, maxima) - */ - - int upball_type = Note_head::balltype_i (nu_l); - int dnball_type = Note_head::balltype_i (nd_l); - - merge_possible = merge_possible && (upball_type > 0); - - if (!to_boolean (me->get_grob_property ("merge-differently-dotted"))) - merge_possible = merge_possible && Rhythmic_head::dot_count (nu_l) == Rhythmic_head::dot_count (nd_l); - - - if (!to_boolean (me->get_grob_property ("merge-differently-headed"))) - merge_possible = merge_possible && - upball_type == dnball_type; - else - /* - Can't merge quarter and half notes. - */ - merge_possible = merge_possible && - !((Rhythmic_head::duration_log (nu_l) == 1 - && Rhythmic_head::duration_log (nd_l) == 2) - ||(Rhythmic_head::duration_log (nu_l) == 2 - && Rhythmic_head::duration_log (nd_l) == 1)); + bool close_half_collide = false; + bool distant_half_collide = false; + bool full_collide = false; int i = 0, j=0; while (i < ups.size () && j < dps.size ()) @@ -171,6 +169,9 @@ check_meshing_chords (Grob*me, } } + full_collide = full_collide || (close_half_collide + && distant_half_collide); + Drul_array center_note_shifts; center_note_shifts[LEFT] = 0.0; center_note_shifts[RIGHT] = 0.0; @@ -178,37 +179,74 @@ check_meshing_chords (Grob*me, Real shift_amount = 1; + bool touch = (ups[0] >= dps.top ()); if (touch) shift_amount *= -1; - /* - for full collisions, the right hand head may obscure dots, so - make sure the dotted heads go to the right. - */ - if ((Rhythmic_head::dot_count (nu_l) > Rhythmic_head::dot_count (nd_l) - && full_collide)) - shift_amount = 1; - - /* - TODO: these numbers are magic; should devise a set of grob props - to tune this behavior. */ + /* For full collisions, the right hand head may obscure dots, so + make sure the dotted heads go to the right. */ + bool stem_to_stem = false; + if (full_collide) + if (Rhythmic_head::dot_count (nu) > Rhythmic_head::dot_count (nd)) + shift_amount = 1; + else if (Rhythmic_head::dot_count (nu) < Rhythmic_head::dot_count (nd)) + stem_to_stem = true; if (merge_possible) { - shift_amount *= 0.0; + shift_amount = 0; + + + /* If possible, don't wipe any heads. Else, wipe shortest head, + or head with smallest amount of dots. Note: when merging + different heads, dots on the smaller one disappear. */ Grob *wipe_ball = 0; + Grob *dot_wipe_head = nu; - if (upball_type < dnball_type) - wipe_ball = nd_l; - else if (upball_type > dnball_type) - wipe_ball = nu_l; + if (upball_type == dnball_type) + { + if (Rhythmic_head::dot_count (nd) < Rhythmic_head::dot_count (nu)) + { + wipe_ball = nd; + dot_wipe_head = nd; + } + else if (Rhythmic_head::dot_count (nd) > Rhythmic_head::dot_count (nu)) + { + dot_wipe_head = nu; + wipe_ball = nu; + } + else + { + dot_wipe_head = nu; + } + } + else if (dnball_type > upball_type) + { + wipe_ball = nd; + dot_wipe_head = nd; + } + else if (dnball_type < upball_type) + { + wipe_ball = nu; + dot_wipe_head = nu; + } - if (wipe_ball) + if (dot_wipe_head) + { + if (Grob *d = unsmob_grob (dot_wipe_head->get_property ("dot"))) + d->suicide (); + } + + if (wipe_ball && wipe_ball->live ()) { - wipe_ball->set_grob_property ("transparent", SCM_BOOL_T); - wipe_ball->set_grob_property ("molecule", SCM_EOL); + wipe_ball->set_property ("transparent", SCM_BOOL_T); + wipe_ball->set_property ("stencil", SCM_EOL); } } + /* TODO: these numbers are magic; should devise a set of grob props + to tune this behavior. */ + else if (stem_to_stem) + shift_amount = -abs (shift_amount) * 0.65; else if (close_half_collide && !touch) shift_amount *= 0.52; else if (distant_half_collide && !touch) @@ -216,14 +254,24 @@ check_meshing_chords (Grob*me, else if (distant_half_collide || close_half_collide || full_collide) shift_amount *= 0.5; - /* - we're meshing. - */ - else if (Rhythmic_head::dot_count (nu_l) || Rhythmic_head::dot_count (nd_l)) + /* we're meshing. */ + else if (Rhythmic_head::dot_count (nu) || Rhythmic_head::dot_count (nd)) shift_amount *= 0.1; else shift_amount *= 0.25; + /* For full or close half collisions, the right hand head may + obscure dots. Move dots to the right. */ + if (abs (shift_amount) > 1e-6 + && Rhythmic_head::dot_count (nd) > Rhythmic_head::dot_count (nu) + && (full_collide || close_half_collide)) + { + Grob *d = unsmob_grob (nd->get_property ("dot")); + Grob *parent = d->get_parent (X_AXIS); + if (Dot_column::has_interface (parent)) + Side_position_interface::add_support (parent, nu); + } + Direction d = UP; do { @@ -240,22 +288,18 @@ Note_collision_interface::do_shifts (Grob* me) SCM autos (automatic_shift (me, cg)); SCM hand (forced_shift (me)); - - Direction d = UP; Real wid = 0.0; do { - if(cg[d].size()) + if (cg[d].size ()) { Grob *h = cg[d][0]; - wid = Note_column::first_head(h)->extent(h,X_AXIS).length() ; + wid = Note_column::first_head (h)->extent (h,X_AXIS).length () ; } } - while (flip (&d) != UP); - Link_array done; for (; gh_pair_p (hand); hand =ly_cdr (hand)) @@ -271,7 +315,7 @@ Note_collision_interface::do_shifts (Grob* me) Grob * s = unsmob_grob (ly_caar (autos)); Real amount = gh_scm2double (ly_cdar (autos)); - if (!done.find_l (s)) + if (!done.find (s)) s->translate_axis (amount * wid, X_AXIS); } } @@ -281,7 +325,7 @@ Note_collision_interface::get_clash_groups (Grob *me) { Drul_array > clash_groups; - SCM s = me->get_grob_property ("elements"); + SCM s = me->get_property ("elements"); for (; gh_pair_p (s); s = ly_cdr (s)) { SCM car = ly_car (s); @@ -325,7 +369,7 @@ Note_collision_interface::automatic_shift (Grob *me, for (int i=0; i < clashes.size (); i++) { SCM sh - = clashes[i]->get_grob_property ("horizontal-shift"); + = clashes[i]->get_property ("horizontal-shift"); if (gh_number_p (sh)) shift.push (gh_scm2int (sh)); @@ -393,8 +437,9 @@ Note_collision_interface::automatic_shift (Grob *me, do { for (int i=0; i < clash_groups[d].size (); i++) - tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm (), gh_double2scm (offsets[d][i])), - tups); + tups = gh_cons (gh_cons (clash_groups[d][i]->self_scm (), + gh_double2scm (offsets[d][i])), + tups); } while (flip (&d) != UP); return tups; @@ -406,12 +451,12 @@ Note_collision_interface::forced_shift (Grob *me) { SCM tups = SCM_EOL; - SCM s = me->get_grob_property ("elements"); + SCM s = me->get_property ("elements"); for (; gh_pair_p (s); s = ly_cdr (s)) { Grob * se = unsmob_grob (ly_car (s)); - SCM force = se->remove_grob_property ("force-hshift"); + SCM force = se->get_property ("force-hshift"); if (gh_number_p (force)) { tups = gh_cons (gh_cons (se->self_scm (), force), @@ -422,18 +467,20 @@ Note_collision_interface::forced_shift (Grob *me) } void -Note_collision_interface::add_column (Grob*me,Grob* ncol_l) +Note_collision_interface::add_column (Grob*me,Grob* ncol) { - ncol_l->add_offset_callback (Note_collision_interface::force_shift_callback_proc, X_AXIS); - Axis_group_interface::add_element (me, ncol_l); - me->add_dependency (ncol_l); + ncol->add_offset_callback (Note_collision_interface::force_shift_callback_proc, X_AXIS); + Axis_group_interface::add_element (me, ncol); + me->add_dependency (ncol); } ADD_INTERFACE (Note_collision_interface, "note-collision-interface", - "An object that handles collisions between notes with different stem -directions and horizontal shifts. Most of the interesting properties -are to be set in @ref{note-column-interface}: these are -@code{force-hshift} and @code{horizontal-shift}. -", - "merge-differently-dotted merge-differently-headed collision-done"); + "An object that handles collisions between notes with different stem " + "directions and horizontal shifts. Most of the interesting properties " + "are to be set in @ref{note-column-interface}: these are " + "@code{force-hshift} and @code{horizontal-shift}." + + , + + "merge-differently-dotted merge-differently-headed positioning-done");