X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-collision.cc;h=664ce234a7ea92fc1aa06ae3d2800cac70c74932;hb=acae40c266a7df9b4882f937c733745c803ac9e4;hp=6f205e3f22153dd4763d15e95247d93111566e73;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 6f205e3f22..664ce234a7 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -55,8 +55,10 @@ check_meshing_chords (Grob *me, vector ups = Stem::note_head_positions (stems[UP]); vector dps = Stem::note_head_positions (stems[DOWN]); + int threshold = robust_scm2int (me->get_property ("note-collision-threshold"), 1); + /* Too far apart to collide. */ - if (ups[0] > dps.back () + 1) + if (ups[0] > dps.back () + threshold) return 0.0; /* If the chords just 'touch' their extreme noteheads, @@ -64,8 +66,8 @@ check_meshing_chords (Grob *me, */ bool touch = false; if (ups[0] >= dps.back () - && (dps.size () < 2 || ups[0] >= dps[dps.size () - 2] + 2) - && (ups.size () < 2 || ups[1] >= dps.back () + 2)) + && (dps.size () < 2 || ups[0] >= dps[dps.size () - 2] + threshold + 1) + && (ups.size () < 2 || ups[1] >= dps.back () + threshold + 1)) touch = true; /* Filter out the 'o's in this configuration, since they're no @@ -141,7 +143,9 @@ check_meshing_chords (Grob *me, for (vsize i = 0, j = 0; i < ups.size () && j < dps.size ();) { - if (abs (ups[i] - dps[j]) == 1) + if (ups[i] == dps[j]) + full_collide = true; + else if (abs (ups[i] - dps[j]) <= threshold) { merge_possible = false; if (ups[i] > dps[j]) @@ -149,8 +153,6 @@ check_meshing_chords (Grob *me, else distant_half_collide = true; } - else if (ups[i] == dps[j]) - full_collide = true; else if (ups[i] > dps[0] && ups[i] < dps.back ()) merge_possible = false; else if (dps[j] > ups[0] && dps[j] < ups.back ()) @@ -266,7 +268,7 @@ check_meshing_chords (Grob *me, if (dot_wipe_head) { - if (Grob *d = Grob::unsmob (dot_wipe_head->get_object ("dot"))) + if (Grob *d = unsmob (dot_wipe_head->get_object ("dot"))) d->suicide (); } @@ -307,18 +309,18 @@ check_meshing_chords (Grob *me, if (shift_amount < -1e-6 && Rhythmic_head::dot_count (head_up)) { - Grob *d = Grob::unsmob (head_up->get_object ("dot")); + Grob *d = unsmob (head_up->get_object ("dot")); Grob *parent = d->get_parent (X_AXIS); - if (Dot_column::has_interface (parent)) + if (has_interface (parent)) Side_position_interface::add_support (parent, head_down); } else if (Rhythmic_head::dot_count (head_down)) { - Grob *d = Grob::unsmob (head_down->get_object ("dot")); + Grob *d = unsmob (head_down->get_object ("dot")); Grob *parent = d->get_parent (X_AXIS); - if (Dot_column::has_interface (parent)) + if (has_interface (parent)) { - Grob *stem = Grob::unsmob (head_up->get_object ("stem")); + Grob *stem = unsmob (head_up->get_object ("stem")); // Loop over all heads on an up-pointing-stem to see if dots // need to clear any heads suspended on its right side. extract_grob_set (stem, "note-heads", heads); @@ -331,12 +333,12 @@ check_meshing_chords (Grob *me, if (shift_amount > 1e-6 && Rhythmic_head::dot_count (head_down)) { - Grob *dot_down = Grob::unsmob (head_down->get_object ("dot")); + Grob *dot_down = unsmob (head_down->get_object ("dot")); Grob *col_down = dot_down->get_parent (X_AXIS); Direction dir = UP; if (Rhythmic_head::dot_count (head_up)) { - Grob *dot_up = Grob::unsmob (head_up->get_object ("dot")); + Grob *dot_up = unsmob (head_up->get_object ("dot")); Grob *col_up = dot_up->get_parent (X_AXIS); if (col_up == col_down) // let the common DotColumn arrange dots dir = CENTER; @@ -345,10 +347,10 @@ check_meshing_chords (Grob *me, } if (dir != CENTER) { - Grob *stem = Grob::unsmob (head_down->get_object ("stem")); + Grob *stem = unsmob (head_down->get_object ("stem")); extract_grob_set (stem, "note-heads", heads); for (vsize i = 0; i < heads.size (); i++) - if (Grob *dot = Grob::unsmob (heads[i]->get_object ("dot"))) + if (Grob *dot = unsmob (heads[i]->get_object ("dot"))) dot->set_property ("direction", scm_from_int (dir)); } } @@ -360,7 +362,7 @@ MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1) SCM Note_collision_interface::calc_positioning_done (SCM smob) { - Grob *me = Grob::unsmob (smob); + Grob *me = unsmob (smob); me->set_property ("positioning-done", SCM_BOOL_T); Drul_array > clash_groups = get_clash_groups (me); @@ -392,22 +394,20 @@ Note_collision_interface::calc_positioning_done (SCM smob) } vector done; - Real left_most = 1e6; + Real left_most = 0.0; vector amounts; for (; scm_is_pair (hand); hand = scm_cdr (hand)) { - Grob *s = Grob::unsmob (scm_caar (hand)); + Grob *s = unsmob (scm_caar (hand)); Real amount = scm_to_double (scm_cdar (hand)) * wid; done.push_back (s); amounts.push_back (amount); - if (amount < left_most) - left_most = amount; } for (; scm_is_pair (autos); autos = scm_cdr (autos)) { - Grob *s = Grob::unsmob (scm_caar (autos)); + Grob *s = unsmob (scm_caar (autos)); Real amount = scm_to_double (scm_cdar (autos)) * wid; vsize x = find (done, s) - done.begin (); @@ -435,7 +435,7 @@ Note_collision_interface::get_clash_groups (Grob *me) for (vsize i = 0; i < elements.size (); i++) { Grob *se = elements[i]; - if (Note_column::has_interface (se)) + if (has_interface (se)) { if (!Note_column::dir (se)) se->programming_error ("note-column has no direction"); @@ -589,7 +589,7 @@ Note_collision_interface::note_head_positions (Grob *me) vector out; extract_grob_set (me, "elements", elts); for (vsize i = 0; i < elts.size (); i++) - if (Grob *stem = Grob::unsmob (elts[i]->get_object ("stem"))) + if (Grob *stem = unsmob (elts[i]->get_object ("stem"))) { vector nhp = Stem::note_head_positions (stem); out.insert (out.end (), nhp.begin (), nhp.end ()); @@ -609,6 +609,7 @@ ADD_INTERFACE (Note_collision_interface, /* properties */ "merge-differently-dotted " "merge-differently-headed " + "note-collision-threshold " "positioning-done " "prefer-dotted-right " );