X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-collision.cc;h=664ce234a7ea92fc1aa06ae3d2800cac70c74932;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=a0be58907a6547151b167f7bd6fe63fb2cdd6556;hpb=c980af5e4f43a56ed9bf7a697858cd151fb92472;p=lilypond.git diff --git a/lily/note-collision.cc b/lily/note-collision.cc index a0be58907a..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 ()) @@ -209,8 +211,10 @@ check_meshing_chords (Grob *me, SCM up_style = head_up->get_property ("style"); SCM down_style = head_down->get_property ("style"); if (merge_possible - && (up_style == ly_symbol2scm ("fa") || up_style == ly_symbol2scm ("faThin")) - && (down_style == ly_symbol2scm ("fa") || down_style == ly_symbol2scm ("faThin"))) + && (scm_is_eq (up_style, ly_symbol2scm ("fa")) + || scm_is_eq (up_style, ly_symbol2scm ("faThin"))) + && (scm_is_eq (down_style, ly_symbol2scm ("fa")) + || scm_is_eq (down_style, ly_symbol2scm ("faThin")))) { Offset att = Offset (0.0, -1.0); head_up->set_property ("stem-attachment", ly_offset2scm (att)); @@ -264,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 (); } @@ -305,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); @@ -329,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; @@ -343,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)); } } @@ -358,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); @@ -390,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 (); @@ -433,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"); @@ -503,24 +505,23 @@ Note_collision_interface::automatic_shift (Grob *me, if (i == 0) offset = inner_offset; - else if (shifts[i] == shifts[i - 1]) - { - // Match the previous notecolumn offset, - // but warn if the user did not set these equal shifts explictly - if (!scm_is_number (sh)) - col->warning (_ ("this Voice needs a \\voiceXx or \\shiftXx setting")); - } - else if (extents[d][i][UP] > extents[d][i - 1][DOWN] - && extents[d][i][DOWN] < extents[d][i - 1][UP]) - offset += 1.0; // fully clear the inner-voice heads else { - // check if we cross the inner voice - if (d * extents[d][i][-d] >= d * extents[d][i - 1][d]) + bool explicit_shift = scm_is_number (sh); + if (!explicit_shift) + col->warning (_ ("this Voice needs a \\voiceXx or \\shiftXx setting")); + + if (explicit_shift && shifts[i] == shifts[i - 1]) + ; // Match the previous notecolumn offset + else if (extents[d][i][UP] > extents[d][i - 1][DOWN] + && extents[d][i][DOWN] < extents[d][i - 1][UP]) + offset += 1.0; // fully clear the previous-notecolumn heads + else if (d * extents[d][i][-d] >= d * extents[d][i - 1][d]) offset += Stem::is_valid_stem (stems[d][i - 1]) - ? 1.0 : 0.5; + ? 1.0 : 0.5; // we cross the previous notecolumn else if (Stem::is_valid_stem (stems[d][i])) offset += 0.5; + // check if we cross the opposite-stemmed voices if (d * extents[d][i][-d] < d * extent_union[-d][d]) offset = max (offset, 0.5); @@ -588,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 ()); @@ -608,6 +609,7 @@ ADD_INTERFACE (Note_collision_interface, /* properties */ "merge-differently-dotted " "merge-differently-headed " + "note-collision-threshold " "positioning-done " "prefer-dotted-right " );