X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-collision.cc;h=ddfbf19983e14572dcf8fe4eec4baae09489cce1;hb=45e73c21395bfa26f928c216fc6ee72fc9fa68d9;hp=709a7d01923f286687374dd1c315b9e1e8aeefad;hpb=545092a25d8ca41dc90b87482474b3719f7130a9;p=lilypond.git diff --git a/lily/note-collision.cc b/lily/note-collision.cc index 709a7d0192..ddfbf19983 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -3,30 +3,30 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ #include "note-collision.hh" - -#include "warn.hh" +#include "axis-group-interface.hh" +#include "dot-column.hh" +#include "international.hh" #include "note-column.hh" #include "note-head.hh" -#include "rhythmic-head.hh" #include "output-def.hh" -#include "axis-group-interface.hh" -#include "stem.hh" -#include "side-position-interface.hh" -#include "dot-column.hh" #include "pointer-group-interface.hh" - +#include "rhythmic-head.hh" +#include "staff-symbol-referencer.hh" +#include "side-position-interface.hh" +#include "stem.hh" +#include "warn.hh" void check_meshing_chords (Grob *me, - Drul_array > *offsets, - Drul_array > const &extents, - Drul_array > const &clash_groups) + Drul_array > *offsets, + Drul_array > const &extents, + Drul_array > const &clash_groups) { if (!extents[UP].size () || ! extents[DOWN].size ()) @@ -39,26 +39,30 @@ check_meshing_chords (Grob *me, if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd)) return; + Drul_array stems (Note_column::get_stem (cd), + Note_column::get_stem (cu)); + 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)); + vector ups = Stem::note_head_positions (Note_column::get_stem (cu)); + vector dps = Stem::note_head_positions (Note_column::get_stem (cd)); /* Too far apart to collide. */ - if (ups[0] > dps.top () + 1) + if (ups[0] > dps.back () + 1) return; - // FIXME: what's this? - bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ()); + /* Merge heads if the notes lie the same line, or if the "stem-up-note" is + above the "stem-down-note". */ + bool merge_possible = (ups[0] >= dps[0]) && (ups.back () >= dps.back ()); /* Do not merge notes typeset in different style. */ if (!ly_is_equal (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); + int upball_type = Rhythmic_head::duration_log (nu); + int dnball_type = Rhythmic_head::duration_log (nd); /* Do not merge whole notes (or longer, like breve, longa, maxima). */ if (merge_possible && (upball_type <= 0 || dnball_type <= 0)) @@ -76,13 +80,23 @@ check_meshing_chords (Grob *me, && !to_boolean (me->get_property ("merge-differently-headed"))) merge_possible = false; + if (merge_possible + && nu->get_property ("style") == ly_symbol2scm ("fa") + && nd->get_property ("style") == ly_symbol2scm ("fa")) + { + Interval uphead_size = nu->extent (nu, Y_AXIS); + Offset att = Offset (0.0, -1.0); + nu->set_property ("stem-attachment", ly_offset2scm (att)); + nu->set_property ("transparent", SCM_BOOL_T); + } + /* 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))) + && ((Stem::duration_log (stems[UP]) == 1 + && Stem::duration_log (stems[DOWN]) == 2) + || (Stem::duration_log (stems[UP]) == 2 + && Stem::duration_log (stems[DOWN]) == 1))) merge_possible = false; /* @@ -118,8 +132,7 @@ check_meshing_chords (Grob *me, bool distant_half_collide = false; bool full_collide = false; - int i = 0, j = 0; - while (i < ups.size () && j < dps.size ()) + for (vsize i = 0, j = 0; i < ups.size () && j < dps.size (); ) { if (abs (ups[i] - dps[j]) == 1) { @@ -131,9 +144,9 @@ check_meshing_chords (Grob *me, } else if (ups[i] == dps[j]) full_collide = true; - else if (ups[i] > dps[0] && ups[i] < dps.top ()) + else if (ups[i] > dps[0] && ups[i] < dps.back ()) merge_possible = false; - else if (dps[j] > ups[0] && dps[j] < ups.top ()) + else if (dps[j] > ups[0] && dps[j] < ups.back ()) merge_possible = false; if (ups[i] < dps[j]) @@ -156,7 +169,7 @@ check_meshing_chords (Grob *me, Real shift_amount = 1; - bool touch = (ups[0] >= dps.top ()); + bool touch = (ups[0] >= dps.back ()); if (touch) shift_amount *= -1; @@ -233,6 +246,28 @@ check_meshing_chords (Grob *me, else shift_amount *= 0.17; + /* + * Fix issue #44: + * + * Dots from left note head collide with right note head. Only occurs + * with a close half collide, if the left note head is between + * lines and the right note head is on a line, and if right note head + * hasn't got any dots. + */ + if (close_half_collide + && Rhythmic_head::dot_count (nu) + && !Rhythmic_head::dot_count (nd)) + { + Grob *staff = Staff_symbol_referencer::get_staff_symbol (me); + if (!Staff_symbol_referencer::on_line (staff, ups[0])) + { + Grob *d = unsmob_grob (nu->get_object ("dot")); + Grob *parent = d->get_parent (X_AXIS); + if (Dot_column::has_interface (parent)) + Side_position_interface::add_support (parent, nd); + } + } + /* For full or close half collisions, the right hand head may obscure dots. Move dots to the right. */ if (abs (shift_amount) > 1e-6 @@ -260,7 +295,7 @@ check_meshing_chords (Grob *me, Direction d = UP; do { - for (int i = 0; i < clash_groups[d].size (); i++) + for (vsize i = 0; i < clash_groups[d].size (); i++) (*offsets)[d][i] += d * shift_amount; } while ((flip (&d)) != UP); @@ -272,12 +307,12 @@ SCM Note_collision_interface::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); - Drul_array > cg = get_clash_groups (me); + Drul_array > cg = get_clash_groups (me); Direction d = UP; do { - for (int i = cg[d].size(); i--; ) + for (vsize i = cg[d].size(); i--; ) { /* Trigger positioning @@ -296,22 +331,24 @@ Note_collision_interface::calc_positioning_done (SCM smob) if (cg[d].size ()) { Grob *h = cg[d][0]; - wid = Note_column::first_head (h)->extent (h, X_AXIS).length (); + Grob *fh = Note_column::first_head (h); + if (fh) + wid = fh->extent (h, X_AXIS).length (); } } while (flip (&d) != UP); - Link_array done; + vector done; Real left_most = 1e6; - Array amounts; + vector amounts; for (; scm_is_pair (hand); hand = scm_cdr (hand)) { Grob *s = unsmob_grob (scm_caar (hand)); Real amount = scm_to_double (scm_cdar (hand)) * wid; - done.push (s); - amounts.push (amount); + done.push_back (s); + amounts.push_back (amount); if (amount < left_most) left_most = amount; } @@ -320,39 +357,47 @@ Note_collision_interface::calc_positioning_done (SCM smob) Grob *s = unsmob_grob (scm_caar (autos)); Real amount = scm_to_double (scm_cdar (autos)) * wid; - if (!done.find (s)) + vsize x = find (done, s) - done.begin (); + if (x == VPOS || x >= done.size ()) { - done.push (s); - amounts.push (amount); + done.push_back (s); + amounts.push_back (amount); if (amount < left_most) left_most = amount; } } - for (int i = 0; i < amounts.size (); i++) + for (vsize i = 0; i < amounts.size (); i++) done[i]->translate_axis (amounts[i] - left_most, X_AXIS); return SCM_BOOL_T; } -Drul_array < Link_array > +Drul_array < vector > Note_collision_interface::get_clash_groups (Grob *me) { - Drul_array > clash_groups; + Drul_array > clash_groups; extract_grob_set (me, "elements", elements); - for (int i = 0; i < elements.size (); i++) + for (vsize i = 0; i < elements.size (); i++) { Grob *se = elements[i]; if (Note_column::has_interface (se)) - clash_groups[Note_column::dir (se)].push (se); + { + if (!Note_column::dir (se)) + { + se->programming_error ("note-column has no direction"); + } + else + clash_groups[Note_column::dir (se)].push_back (se); + } } Direction d = UP; do { - Link_array &clashes (clash_groups[d]); - clashes.sort (Note_column::shift_compare); + vector &clashes (clash_groups[d]); + vector_sort (clashes, Note_column::shift_less); } while ((flip (&d)) != UP); @@ -366,30 +411,30 @@ Note_collision_interface::get_clash_groups (Grob *me) */ SCM Note_collision_interface::automatic_shift (Grob *me, - Drul_array < Link_array + Drul_array < vector > clash_groups) { - Drul_array < Array > shifts; + Drul_array < vector > shifts; SCM tups = SCM_EOL; Direction d = UP; do { - Array &shift (shifts[d]); - Link_array &clashes (clash_groups[d]); + vector &shift (shifts[d]); + vector &clashes (clash_groups[d]); - for (int i = 0; i < clashes.size (); i++) + for (vsize i = 0; i < clashes.size (); i++) { SCM sh = clashes[i]->get_property ("horizontal-shift"); if (scm_is_number (sh)) - shift.push (scm_to_int (sh)); + shift.push_back (scm_to_int (sh)); else - shift.push (0); + shift.push_back (0); } - for (int i = 1; i < shift.size (); i++) + for (vsize i = 1; i < shift.size (); i++) { if (shift[i - 1] == shift[i]) { @@ -400,18 +445,18 @@ Note_collision_interface::automatic_shift (Grob *me, } while ((flip (&d)) != UP); - Drul_array > extents; - Drul_array > offsets; + Drul_array > extents; + Drul_array > offsets; d = UP; do { - for (int i = 0; i < clash_groups[d].size (); i++) + for (vsize i = 0; i < clash_groups[d].size (); i++) { Slice s (Note_column::head_positions_interval (clash_groups[d][i])); s[LEFT]--; s[RIGHT]++; - extents[d].push (s); - offsets[d].push (d * 0.5 * i); + extents[d].push_back (s); + offsets[d].push_back (d * 0.5 * i); } } while ((flip (&d)) != UP); @@ -427,13 +472,13 @@ Note_collision_interface::automatic_shift (Grob *me, do { - for (int i = 1; i < clash_groups[d].size (); i++) + for (vsize i = 1; i < clash_groups[d].size (); i++) { Slice prev = extents[d][i - 1]; prev.intersect (extents[d][i]); if (prev.length () > 0 || (extents[-d].size () && d * (extents[d][i][-d] - extents[-d][0][d]) < 0)) - for (int j = i; j < clash_groups[d].size (); j++) + for (vsize j = i; j < clash_groups[d].size (); j++) offsets[d][j] += d * 0.5; } } @@ -447,7 +492,7 @@ Note_collision_interface::automatic_shift (Grob *me, do { - for (int i = 0; i < clash_groups[d].size (); i++) + for (vsize i = 0; i < clash_groups[d].size (); i++) tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (), scm_from_double (offsets[d][i])), tups); @@ -463,7 +508,7 @@ Note_collision_interface::forced_shift (Grob *me) SCM tups = SCM_EOL; extract_grob_set (me, "elements", elements); - for (int i = 0; i < elements.size (); i++) + for (vsize i = 0; i < elements.size (); i++) { Grob *se = elements[i]; @@ -493,4 +538,4 @@ ADD_INTERFACE (Note_collision_interface, "note-collision-interface", /* properties */ "merge-differently-dotted " "merge-differently-headed " - "positioning-done"); + "positioning-done ");