X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-collision.cc;h=79a65845759b259e6b1bb6e9fafa84ca51b9b979;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=b7060092e104478530e3d9b612f64f1981dcc305;hpb=84e144718964f20c48ff8dccaea8de9741df07e4;p=lilypond.git diff --git a/lily/note-collision.cc b/lily/note-collision.cc index b7060092e1..79a6584575 100644 --- a/lily/note-collision.cc +++ b/lily/note-collision.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Han-Wen Nienhuys + Copyright (C) 1997--2014 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -56,13 +56,38 @@ check_meshing_chords (Grob *me, Grob *head_up = Note_column::first_head (clash_up); Grob *head_down = Note_column::first_head (clash_down); - vector ups = Stem::note_head_positions (Note_column::get_stem (clash_up)); - vector dps = Stem::note_head_positions (Note_column::get_stem (clash_down)); + Interval extent_up = head_up->extent (head_up, X_AXIS); + Interval extent_down = head_down->extent (head_down, X_AXIS); + + /* Staff-positions of all noteheads on each stem */ + vector ups = Stem::note_head_positions (stems[UP]); + vector dps = Stem::note_head_positions (stems[DOWN]); /* Too far apart to collide. */ if (ups[0] > dps.back () + 1) return; + /* If the chords just 'touch' their extreme noteheads, + then we can align their stems. + */ + 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)) + touch = true; + + /* Filter out the 'o's in this configuration, since they're no + * part in the collision. + * + * | + * x|o + * x|o + * x + * + */ + ups = Stem::note_head_positions (stems[UP], true); + dps = Stem::note_head_positions (stems[DOWN], true); + /* 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 ()); @@ -118,16 +143,6 @@ check_meshing_chords (Grob *me, * */ - /* TODO: filter out the 'o's in this configuration, since they're no - * part in the collision. - * - * | - * x|o - * x|o - * x - * - */ - bool close_half_collide = false; bool distant_half_collide = false; bool full_collide = false; @@ -161,17 +176,9 @@ check_meshing_chords (Grob *me, } full_collide = full_collide || (close_half_collide - && distant_half_collide); - - /* If the only collision is in the extreme noteheads, - then their stems can line up and the chords just 'touch'. - A half collision with the next note along the chord prevents touching. - */ - 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)) - touch = true; + && distant_half_collide) + || ( distant_half_collide // like full_ for wholes and longer + && (up_ball_type <= 0 || down_ball_type <= 0)); /* Determine which chord goes on the left, and which goes right. Up-stem usually goes on the right, but if chords just 'touch' we can put @@ -186,7 +193,7 @@ check_meshing_chords (Grob *me, && Rhythmic_head::dot_count (head_up) < Rhythmic_head::dot_count (head_down)) { shift_amount = -1; - if (!touch || full_collide) + if (!touch) // remember to leave clearance between stems stem_to_stem = true; } @@ -224,7 +231,8 @@ check_meshing_chords (Grob *me, /* 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. */ + different heads, dots on the smaller one disappear; and when + merging identical heads, dots on the down-stem head disappear */ Grob *wipe_ball = 0; Grob *dot_wipe_head = head_up; @@ -241,7 +249,7 @@ check_meshing_chords (Grob *me, wipe_ball = head_up; } else - dot_wipe_head = head_up; + dot_wipe_head = head_down; } else if (down_ball_type > up_ball_type) { @@ -259,13 +267,12 @@ check_meshing_chords (Grob *me, */ if (Stem::duration_log (stems[DOWN]) == 1 && Stem::duration_log (stems[UP]) >= 3) - shift_amount = (1 - head_up->extent (head_up, X_AXIS).length () - / head_down->extent (head_down, X_AXIS).length ()) * 0.5; + shift_amount = (1 - extent_up[RIGHT] / extent_down[RIGHT]) * 0.5; } if (dot_wipe_head) { - if (Grob *d = unsmob_grob (dot_wipe_head->get_object ("dot"))) + if (Grob *d = Grob::unsmob (dot_wipe_head->get_object ("dot"))) d->suicide (); } @@ -291,70 +298,84 @@ check_meshing_chords (Grob *me, else shift_amount *= 0.17; - /* - */ - if (full_collide - && down_ball_type *up_ball_type == 0) + /* The offsets computed in this routine are multiplied, + in calc_positioning_done(), by the width of the downstem note. + The shift required to clear collisions, however, depends on the extents + of the note heads on the sides that interfere. */ + if (shift_amount < 0.0) // Down-stem shifts right. + shift_amount *= (extent_up[RIGHT] - extent_down[LEFT]) / extent_down.length (); + else // Up-stem shifts right. + shift_amount *= (extent_down[RIGHT] - extent_up[LEFT]) / extent_down.length (); + + /* If any dotted notes ended up on the left, + tell the Dot_Columnn to avoid the note heads on the right. + */ + if (shift_amount < -1e-6 + && Rhythmic_head::dot_count (head_up)) + { + Grob *d = Grob::unsmob (head_up->get_object ("dot")); + Grob *parent = d->get_parent (X_AXIS); + if (Dot_column::has_interface (parent)) + Side_position_interface::add_support (parent, head_down); + } + else if (Rhythmic_head::dot_count (head_down)) { - if (up_ball_type == 0 && down_ball_type == 1) - shift_amount *= 1.25; - else if (up_ball_type == 0 && down_ball_type == 2) - shift_amount *= 1.35; - else if (down_ball_type == 0 && up_ball_type == 1) - shift_amount *= 0.7; - else if (down_ball_type == 0 && up_ball_type == 2) - shift_amount *= 0.75; + Grob *d = Grob::unsmob (head_down->get_object ("dot")); + Grob *parent = d->get_parent (X_AXIS); + if (Dot_column::has_interface (parent)) + { + Grob *stem = Grob::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); + for (vsize i = 0; i < heads.size (); i++) + Side_position_interface::add_support (parent, heads[i]); + } } - /* If the dotted notes ended up on the left, and there are collisions, - tell the Dot_Columnn to avoid the notes on the right. - */ - if (full_collide || close_half_collide || distant_half_collide) + // In meshed chords with dots on the left, adjust dot direction + if (shift_amount > 1e-6 + && Rhythmic_head::dot_count (head_down)) { - if (shift_amount < -1e-6 - && Rhythmic_head::dot_count (head_up) - && !Rhythmic_head::dot_count (head_down)) + Grob *dot_down = Grob::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 *d = unsmob_grob (head_up->get_object ("dot")); - Grob *parent = d->get_parent (X_AXIS); - if (Dot_column::has_interface (parent)) - Side_position_interface::add_support (parent, head_down); + Grob *dot_up = Grob::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; + else // conform to the dot direction on the up-stem chord + dir = robust_scm2dir (dot_up->get_property ("direction"), UP); } - else if (Rhythmic_head::dot_count (head_down) - && !Rhythmic_head::dot_count (head_up)) + if (dir != CENTER) { - Grob *d = unsmob_grob (head_down->get_object ("dot")); - Grob *parent = d->get_parent (X_AXIS); - if (Dot_column::has_interface (parent)) - { - Grob *stem = unsmob_grob (head_up->get_object ("stem")); - extract_grob_set (stem, "note-heads", heads); - for (vsize i = 0; i < heads.size (); i++) - Side_position_interface::add_support (parent, heads[i]); - } + Grob *stem = Grob::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"))) + dot->set_property ("direction", scm_from_int (dir)); } } - Direction d = UP; - do + for (UP_and_DOWN (d)) { for (vsize i = 0; i < clash_groups[d].size (); i++) (*offsets)[d][i] += d * shift_amount; } - while ((flip (&d)) != UP); } MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1) SCM Note_collision_interface::calc_positioning_done (SCM smob) { - Grob *me = unsmob_grob (smob); + Grob *me = Grob::unsmob (smob); me->set_property ("positioning-done", SCM_BOOL_T); Drul_array > clash_groups = get_clash_groups (me); - Direction d = UP; - do + for (UP_and_DOWN (d)) { for (vsize i = clash_groups[d].size (); i--;) { @@ -364,13 +385,12 @@ Note_collision_interface::calc_positioning_done (SCM smob) clash_groups[d][i]->extent (me, X_AXIS); } } - while (flip (&d) != UP); SCM autos (automatic_shift (me, clash_groups)); SCM hand (forced_shift (me)); Real wid = 0.0; - do + for (UP_and_DOWN (d)) { if (clash_groups[d].size ()) { @@ -380,7 +400,6 @@ Note_collision_interface::calc_positioning_done (SCM smob) wid = fh->extent (h, X_AXIS).length (); } } - while (flip (&d) != UP); vector done; Real left_most = 1e6; @@ -388,7 +407,7 @@ Note_collision_interface::calc_positioning_done (SCM smob) vector amounts; for (; scm_is_pair (hand); hand = scm_cdr (hand)) { - Grob *s = unsmob_grob (scm_caar (hand)); + Grob *s = Grob::unsmob (scm_caar (hand)); Real amount = scm_to_double (scm_cdar (hand)) * wid; done.push_back (s); @@ -398,7 +417,7 @@ Note_collision_interface::calc_positioning_done (SCM smob) } for (; scm_is_pair (autos); autos = scm_cdr (autos)) { - Grob *s = unsmob_grob (scm_caar (autos)); + Grob *s = Grob::unsmob (scm_caar (autos)); Real amount = scm_to_double (scm_cdar (autos)) * wid; vsize x = find (done, s) - done.begin (); @@ -435,13 +454,11 @@ Note_collision_interface::get_clash_groups (Grob *me) } } - Direction d = UP; - do + for (UP_and_DOWN (d)) { vector &clashes (clash_groups[d]); vector_sort (clashes, Note_column::shift_less); } - while ((flip (&d)) != UP); return clash_groups; } @@ -457,8 +474,7 @@ Note_collision_interface::automatic_shift (Grob *me, Drul_array < vector > shifts; SCM tups = SCM_EOL; - Direction d = UP; - do + for (UP_and_DOWN (d)) { vector &shift (shifts[d]); vector &clashes (clash_groups[d]); @@ -483,12 +499,10 @@ Note_collision_interface::automatic_shift (Grob *me, } } } - while ((flip (&d)) != UP); Drul_array > extents; Drul_array > offsets; - d = UP; - do + for (UP_and_DOWN (d)) { for (vsize i = 0; i < clash_groups[d].size (); i++) { @@ -499,18 +513,17 @@ Note_collision_interface::automatic_shift (Grob *me, offsets[d].push_back (d * 0.5 * i); } } - while ((flip (&d)) != UP); /* - do horizontal shifts of each direction - - | - x|| - x|| - x| + * do horizontal shifts of each direction + * + * | + * x|| + * x|| + * x| */ - do + for (UP_and_DOWN (d)) { for (vsize i = 1; i < clash_groups[d].size (); i++) { @@ -522,7 +535,6 @@ Note_collision_interface::automatic_shift (Grob *me, offsets[d][j] += d * 0.5; } } - while ((flip (&d)) != UP); /* see input/regression/dot-up-voice-collision.ly @@ -546,14 +558,13 @@ Note_collision_interface::automatic_shift (Grob *me, check_meshing_chords (me, &offsets, extents, clash_groups); - do + for (UP_and_DOWN (d)) { 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); } - while (flip (&d) != UP); return tups; } @@ -583,6 +594,22 @@ Note_collision_interface::add_column (Grob *me, Grob *ncol) Axis_group_interface::add_element (me, ncol); } +vector +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"))) + { + vector nhp = Stem::note_head_positions (stem); + out.insert (out.end (), nhp.begin (), nhp.end ()); + } + + vector_sort (out, less ()); + return out; +} + ADD_INTERFACE (Note_collision_interface, "An object that handles collisions between notes with" " different stem directions and horizontal shifts. Most of"