/*
- collision.cc -- implement Collision
+ This file is part of LilyPond, the GNU music typesetter.
- source file of the GNU LilyPond music typesetter
+ Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ LilyPond is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
#include "note-collision.hh"
-#include <math.h>
-
-#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 "pointer-group-interface.hh"
+#include "item.hh"
+#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
#include "side-position-interface.hh"
-#include "dot-column.hh"
+#include "stem.hh"
+#include "warn.hh"
-MAKE_SCHEME_CALLBACK (Note_collision_interface,force_shift_callback,2);
+Real
+check_meshing_chords (Grob *me,
+ Grob *clash_up, Grob *clash_down)
-SCM
-Note_collision_interface::force_shift_callback (SCM element_smob, SCM axis)
{
- Grob *me = unsmob_grob (element_smob);
- Axis a = (Axis) scm_to_int (axis);
- assert (a == X_AXIS);
-
- me = me->get_parent (a);
-
- if (! to_boolean (me->get_property ("positioning-done")))
- {
- me->set_property ("positioning-done", SCM_BOOL_T);
- do_shifts (me);
- }
-
- return scm_make_real (0.0);
-}
-
+ /* Every note column should have a stem, but avoid a crash. */
+ if (!Note_column::get_stem (clash_up) || !Note_column::get_stem (clash_down))
+ return 0.0;
-void
-check_meshing_chords (Grob *me,
- Drul_array< Array < Real > > *offsets,
- Drul_array< Array < Slice > > const &extents,
- Drul_array<Link_array<Grob> > const &clash_groups)
-
-{
- if (!extents[UP].size () || ! extents[DOWN].size ())
- return;
-
- Grob *cu = clash_groups[UP][0];
- Grob *cd = clash_groups[DOWN][0];
+ Drul_array<Grob *> stems (Note_column::get_stem (clash_down),
+ Note_column::get_stem (clash_up));
- /* Every note column should have a stem, but avoid a crash. */
- if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd))
- return;
+ Grob *head_up = Note_column::first_head (clash_up);
+ Grob *head_down = Note_column::first_head (clash_down);
- Grob *nu = Note_column::first_head (cu);
- Grob *nd = Note_column::first_head (cd);
+ Interval extent_up = head_up->extent (head_up, X_AXIS);
+ Interval extent_down = head_down->extent (head_down, X_AXIS);
- Array<int> ups = Stem::note_head_positions (Note_column::get_stem (cu));
- Array<int> dps = Stem::note_head_positions (Note_column::get_stem (cd));
+ /* Staff-positions of all noteheads on each stem */
+ vector<int> ups = Stem::note_head_positions (stems[UP]);
+ vector<int> dps = Stem::note_head_positions (stems[DOWN]);
- /* Too far apart to collide. */
- if (ups[0] > dps.top () + 1)
- return;
+ int threshold = robust_scm2int (me->get_property ("note-collision-threshold"), 1);
- // FIXME: what's this?
- bool merge_possible = (ups[0] >= dps[0]) && (ups.top () >= dps.top ());
+ /* Too far apart to collide. */
+ if (ups[0] > dps.back () + threshold)
+ return 0.0;
+ /* 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] + 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
+ * 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 ());
/* Do not merge notes typeset in different style. */
- if ( !ly_c_equal_p (nu->get_property ("style"),
- nd->get_property ("style") ) )
+ if (!ly_is_equal (head_up->get_property ("style"),
+ head_down->get_property ("style")))
merge_possible = false;
-
- int upball_type = Note_head::get_balltype (nu);
- int dnball_type = Note_head::get_balltype (nd);
-
- /* Do not merge whole notes (or longer, like breve, longa, maxima). */
- if (merge_possible && (upball_type <= 0 || dnball_type <= 0))
+
+ int up_ball_type = Rhythmic_head::duration_log (head_up);
+ int down_ball_type = Rhythmic_head::duration_log (head_down);
+
+ /* Do not merge whole notes (or longer, like breve, longa, maxima). */
+ if (merge_possible && (up_ball_type <= 0 || down_ball_type <= 0))
merge_possible = false;
if (merge_possible
- && Rhythmic_head::dot_count (nu) != Rhythmic_head::dot_count (nd)
+ && Rhythmic_head::dot_count (head_up) != Rhythmic_head::dot_count (head_down)
&& !to_boolean (me->get_property ("merge-differently-dotted")))
merge_possible = false;
- /* Can only merge different heads if merge-differently-headed is
- set. */
+ /* Can only merge different heads if merge-differently-headed is set. */
if (merge_possible
- && upball_type != dnball_type
+ && up_ball_type != down_ball_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)))
+ && ((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;
-
/*
- this case (distant half collide),
-
- |
- x |
- | x
- |
-
- the noteheads may be closer than this case (close half collide)
-
- |
- |
- x
- x
- |
- |
-
+ * this case (distant half collide),
+ *
+ * |
+ * x |
+ * | x
+ * |
+ *
+ * the noteheads may be closer than this case (close half collide)
+ *
+ * |
+ * |
+ * x
+ * x
+ * |
+ * |
+ *
*/
-
- /* 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;
+ bool distant_half_collide = false;
+ bool full_collide = false;
- int i = 0, j = 0;
- while (i < ups.size () && j < dps.size ())
- {
- if (abs (ups[i] - dps[j]) == 1)
- {
- merge_possible = false;
- if (ups[i] > dps[j])
- close_half_collide = true;
- else
- distant_half_collide = true;
- }
- else if (ups[i]== dps[j])
- full_collide = true;
- else if (ups[i] >dps[0] && ups[i] < dps.top ())
- merge_possible = false;
- else if (dps[j] >ups[0] && dps[j] < ups.top ())
- merge_possible = false;
-
- if (ups[i] < dps[j])
- i++;
- else if (ups[i] > dps[j])
- j++;
- else
- {
- i++;
- j++;
- }
- }
+ for (vsize i = 0, j = 0; i < ups.size () && j < dps.size ();)
+ {
+ if (ups[i] == dps[j])
+ full_collide = true;
+ else if (abs (ups[i] - dps[j]) <= threshold)
+ {
+ merge_possible = false;
+ if (ups[i] > dps[j])
+ close_half_collide = true;
+ else
+ distant_half_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 ())
+ merge_possible = false;
+
+ if (ups[i] < dps[j])
+ i++;
+ else if (ups[i] > dps[j])
+ j++;
+ else
+ {
+ i++;
+ j++;
+ }
+ }
full_collide = full_collide || (close_half_collide
- && distant_half_collide);
-
- Drul_array<Real> center_note_shifts;
- center_note_shifts[LEFT] = 0.0;
- center_note_shifts[RIGHT] = 0.0;
-
-
+ && 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
+ both stems on a common vertical line. In the presense of collisions,
+ right hand heads may obscure dots, so dotted heads to go the right.
+ */
Real shift_amount = 1;
+ bool stem_to_stem = false;
+ if ((full_collide
+ || ((close_half_collide || distant_half_collide)
+ && to_boolean (me->get_property ("prefer-dotted-right"))))
+ && Rhythmic_head::dot_count (head_up) < Rhythmic_head::dot_count (head_down))
+ {
+ shift_amount = -1;
+ if (!touch)
+ // remember to leave clearance between stems
+ stem_to_stem = true;
+ }
+ else if (touch)
+ {
+ // Up-stem note on a line has a raised dot, so no risk of collision
+ Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
+ if ((full_collide
+ || (!Staff_symbol_referencer::on_line (staff, ups[0])
+ && to_boolean (me->get_property ("prefer-dotted-right"))))
+ && Rhythmic_head::dot_count (head_up) > Rhythmic_head::dot_count (head_down))
+ touch = false;
+ else
+ shift_amount = -1;
+ }
- bool touch = (ups[0] >= dps.top ());
- if (touch)
- shift_amount *= -1;
+ /* The solfa is a triangle, which is inverted depending on stem
+ direction. In case of a collision, one of them should be removed,
+ so the resulting note does not look like a block.
+ */
+ SCM up_style = head_up->get_property ("style");
+ SCM down_style = head_down->get_property ("style");
+ if (merge_possible
+ && (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));
+ head_up->set_property ("transparent", SCM_BOOL_T);
+ }
- /* 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;
-
- /* 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. */
+ /* 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; and when
+ merging identical heads, dots on the down-stem head disappear */
Grob *wipe_ball = 0;
- Grob *dot_wipe_head = nu;
-
- 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;
- }
+ Grob *dot_wipe_head = head_up;
+
+ if (up_ball_type == down_ball_type)
+ {
+ if (Rhythmic_head::dot_count (head_down) < Rhythmic_head::dot_count (head_up))
+ {
+ wipe_ball = head_down;
+ dot_wipe_head = head_down;
+ }
+ else if (Rhythmic_head::dot_count (head_down) > Rhythmic_head::dot_count (head_up))
+ {
+ dot_wipe_head = head_up;
+ wipe_ball = head_up;
+ }
+ else
+ dot_wipe_head = head_down;
+ }
+ else if (down_ball_type > up_ball_type)
+ {
+ wipe_ball = head_down;
+ dot_wipe_head = head_down;
+ }
+ else if (down_ball_type < up_ball_type)
+ {
+ wipe_ball = head_up;
+ dot_wipe_head = head_up;
+ /*
+ If upper head is eighth note or shorter, and lower head is half note,
+ shift by the difference between the open and filled note head widths,
+ otherwise upper stem will be misaligned slightly.
+ */
+ if (Stem::duration_log (stems[DOWN]) == 1
+ && Stem::duration_log (stems[UP]) >= 3)
+ shift_amount = (1 - extent_up[RIGHT] / extent_down[RIGHT]) * 0.5;
+ }
if (dot_wipe_head)
- {
- if (Grob *d = unsmob_grob (dot_wipe_head->get_property ("dot")))
- d->suicide ();
- }
-
+ {
+ if (Grob *d = unsmob<Grob> (dot_wipe_head->get_object ("dot")))
+ d->suicide ();
+ }
+
if (wipe_ball && wipe_ball->is_live ())
- {
- wipe_ball->set_property ("transparent", SCM_BOOL_T);
- wipe_ball->set_property ("stencil", SCM_EOL);
- }
+ wipe_ball->set_property ("transparent", SCM_BOOL_T);
}
/* TODO: these numbers are magic; should devise a set of grob props
- to tune this behavior. */
+ 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.65;
+ else if (touch)
+ shift_amount *= 0.5;
+ else if (close_half_collide)
shift_amount *= 0.52;
- else if (distant_half_collide && !touch)
- shift_amount *= 0.4;
- else if (distant_half_collide || close_half_collide || full_collide)
+ else if (full_collide)
shift_amount *= 0.5;
-
- /* we're meshing. */
- else if (Rhythmic_head::dot_count (nu) || Rhythmic_head::dot_count (nd))
+ else if (distant_half_collide)
+ shift_amount *= 0.4;
+
+ /* we're meshing. */
+ else if (Rhythmic_head::dot_count (head_up) || Rhythmic_head::dot_count (head_down))
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))
+ shift_amount *= 0.17;
+
+ /* 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 = unsmob_grob (nd->get_property ("dot"));
+ Grob *d = unsmob<Grob> (head_up->get_object ("dot"));
Grob *parent = d->get_parent (X_AXIS);
-
-
- /*
- FIXME:
-
- |
- x . o
- |
-
-
- the . is put right of o which is erroneous o force-shifted
- far to the right.
- */
- if (Dot_column::has_interface (parent))
- Side_position_interface::add_support (parent, nu);
+ if (has_interface<Dot_column> (parent))
+ Side_position_interface::add_support (parent, head_down);
+ }
+ else if (Rhythmic_head::dot_count (head_down))
+ {
+ Grob *d = unsmob<Grob> (head_down->get_object ("dot"));
+ Grob *parent = d->get_parent (X_AXIS);
+ if (has_interface<Dot_column> (parent))
+ {
+ Grob *stem = unsmob<Grob> (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]);
+ }
}
- Direction d = UP;
- do
+ // In meshed chords with dots on the left, adjust dot direction
+ if (shift_amount > 1e-6
+ && Rhythmic_head::dot_count (head_down))
{
- for (int i = 0; i < clash_groups[d].size (); i++)
- (*offsets)[d][i] += d * shift_amount;
+ Grob *dot_down = unsmob<Grob> (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 = unsmob<Grob> (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);
+ }
+ if (dir != CENTER)
+ {
+ Grob *stem = unsmob<Grob> (head_down->get_object ("stem"));
+ extract_grob_set (stem, "note-heads", heads);
+ for (vsize i = 0; i < heads.size (); i++)
+ if (Grob *dot = unsmob<Grob> (heads[i]->get_object ("dot")))
+ dot->set_property ("direction", scm_from_int (dir));
+ }
}
- while ((flip (&d))!= UP);
+
+ return shift_amount;
}
-void
-Note_collision_interface::do_shifts (Grob* me)
+MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1)
+SCM
+Note_collision_interface::calc_positioning_done (SCM smob)
{
- Drul_array< Link_array <Grob> > cg = get_clash_groups (me);
+ Grob *me = unsmob<Grob> (smob);
+ me->set_property ("positioning-done", SCM_BOOL_T);
+
+ Drul_array<vector<Grob *> > clash_groups = get_clash_groups (me);
+
+ for (UP_and_DOWN (d))
+ {
+ for (vsize i = clash_groups[d].size (); i--;)
+ {
+ /*
+ Trigger positioning
+ */
+ clash_groups[d][i]->extent (me, X_AXIS);
+ }
+ }
- SCM autos (automatic_shift (me, cg));
+ SCM autos (automatic_shift (me, clash_groups));
SCM hand (forced_shift (me));
-
- Direction d = UP;
+
Real wid = 0.0;
- do
+ for (UP_and_DOWN (d))
{
- if (cg[d].size ())
- {
- Grob *h = cg[d][0];
- wid = Note_column::first_head (h)->extent (h,X_AXIS).length () ;
- }
+ if (clash_groups[d].size ())
+ {
+ Grob *h = clash_groups[d][0];
+ Grob *fh = Note_column::first_head (h);
+ if (fh)
+ wid = fh->extent (h, X_AXIS).length ();
+ }
}
- while (flip (&d) != UP);
-
- Link_array<Grob> done;
- Real left_most = 1e6;
-
- Array<Real> amounts;
+
+ vector<Grob *> done;
+ Real left_most = 0.0;
+
+ vector<Real> amounts;
for (; scm_is_pair (hand); hand = scm_cdr (hand))
{
- Grob * s = unsmob_grob (scm_caar (hand));
+ Grob *s = unsmob<Grob> (scm_caar (hand));
Real amount = scm_to_double (scm_cdar (hand)) * wid;
- done.push (s);
- amounts.push (amount);
- if (amount < left_most)
- left_most = amount;
-
+ done.push_back (s);
+ amounts.push_back (amount);
}
for (; scm_is_pair (autos); autos = scm_cdr (autos))
{
- Grob * s = unsmob_grob (scm_caar (autos));
- Real amount = scm_to_double (scm_cdar (autos)) *wid;
-
- if (!done.find (s))
- {
- done.push (s);
- amounts.push (amount);
- if (amount < left_most)
- left_most = amount;
- }
+ Grob *s = unsmob<Grob> (scm_caar (autos));
+ Real amount = scm_to_double (scm_cdar (autos)) * wid;
+
+ vsize x = find (done, s) - done.begin ();
+ if (x == VPOS || x >= done.size ())
+ {
+ done.push_back (s);
+ amounts.push_back (amount);
+ if (amount < left_most)
+ left_most = amount;
+ }
}
- for (int i = 0; i < amounts.size(); i++)
- {
- done[i]->translate_axis (amounts[i] - left_most, X_AXIS);
- }
+ 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 <Grob> >
+Drul_array < vector<Grob *> >
Note_collision_interface::get_clash_groups (Grob *me)
{
- Drul_array<Link_array<Grob> > clash_groups;
-
- SCM s = me->get_property ("elements");
- for (; scm_is_pair (s); s = scm_cdr (s))
- {
- SCM car = scm_car (s);
+ Drul_array<vector<Grob *> > clash_groups;
- Grob * se = unsmob_grob (car);
- if (Note_column::has_interface (se))
- clash_groups[Note_column::dir (se)].push (se);
+ extract_grob_set (me, "elements", elements);
+ for (vsize i = 0; i < elements.size (); i++)
+ {
+ Grob *se = elements[i];
+ if (has_interface<Note_column> (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
+
+ for (UP_and_DOWN (d))
{
- Link_array<Grob> & clashes (clash_groups[d]);
- clashes.sort (Note_column::shift_compare);
+ vector<Grob *> &clashes (clash_groups[d]);
+ vector_sort (clashes, Note_column::shift_less);
}
- while ((flip (&d))!= UP);
return clash_groups;
}
-/** This complicated routine moves note columns around horizontally to
+/*
+ This complicated routine moves note columns around horizontally to
ensure that notes don't clash.
-
- This should be put into Scheme.
- */
+*/
SCM
Note_collision_interface::automatic_shift (Grob *me,
- Drul_array< Link_array <Grob> >
- clash_groups)
+ Drul_array<vector<Grob *> > clash_groups)
{
- Drul_array<Array<int> > shifts;
- SCM tups = SCM_EOL;
+ SCM tups = SCM_EOL;
-
- Direction d = UP;
- do
+ Drul_array<vector<Slice> > extents;
+ Drul_array<Slice> extent_union;
+ Drul_array<vector<Grob *> > stems;
+ for (UP_and_DOWN (d))
{
- Array<int> & shift (shifts[d]);
- Link_array<Grob> & clashes (clash_groups[d]);
-
- for (int 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));
- else
- shift.push (0);
- }
-
- for (int i =1; i < shift.size (); i++)
- {
- if (shift[i-1] == shift[i])
- {
- clashes[0]->warning (_ ("Too many clashing notecolumns. Ignoring them."));
- return tups;
- }
- }
+ 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_back (s);
+ extent_union[d].unite (s);
+ stems[d].push_back (Note_column::get_stem (clash_groups[d][i]));
+ }
}
- while ((flip (&d))!= UP);
- Drul_array< Array < Slice > > extents;
- Drul_array< Array < Real > > offsets;
- d = UP;
- do
+ Real inner_offset
+ = (clash_groups[UP].size () && clash_groups[DOWN].size ())
+ ? check_meshing_chords (me, clash_groups[UP][0], clash_groups[DOWN][0])
+ : 0.0;
+
+ /*
+ * do horizontal shifts of each direction
+ *
+ * |
+ * x||
+ * x||
+ * x|
+ */
+ Drul_array<vector<Real> > offsets;
+ for (UP_and_DOWN (d))
{
- for (int 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);
- }
+ Real offset = inner_offset;
+ vector<int> shifts;
+ for (vsize i = 0; i < clash_groups[d].size (); i++)
+ {
+ Grob *col = clash_groups[d][i];
+ SCM sh = col->get_property ("horizontal-shift");
+ shifts.push_back (robust_scm2int (sh, 0));
+
+ if (i == 0)
+ offset = inner_offset;
+ else
+ {
+ 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; // 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);
+ if (extents[-d].size ()
+ && extents[d][i][UP] > extents[-d][0][DOWN]
+ && extents[d][i][DOWN] < extents[-d][0][UP])
+ offset = max (offset, 1.0);
+ }
+ offsets[d].push_back (d * offset);
+ }
}
- while ((flip (&d))!= UP);
/*
- do horizontal shifts of each direction
-
- |
- x||
- x||
- x|
- */
-
- do
+ see input/regression/dot-up-voice-collision.ly
+ */
+ for (vsize i = 0; i < clash_groups[UP].size (); i++)
{
- for (int 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++)
- offsets[d][j] += d * 0.5;
- }
- }
- while ((flip (&d))!= UP);
-
+ Grob *g = clash_groups[UP][i];
+ Grob *dc = Note_column::dot_column (g);
- /*
- Check if chords are meshing
- */
+ if (dc)
+ for (vsize j = i + 1; j < clash_groups[UP].size (); j++)
+ Side_position_interface::add_support (dc, stems[UP][j]);
+ }
- check_meshing_chords (me, &offsets, extents, clash_groups);
-
- do
+ for (UP_and_DOWN (d))
{
- for (int i = 0; i < clash_groups[d].size (); i++)
- tups = scm_cons (scm_cons (clash_groups[d][i]->self_scm (),
- scm_make_real (offsets[d][i])),
- tups);
+ 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;
}
-
SCM
Note_collision_interface::forced_shift (Grob *me)
{
SCM tups = SCM_EOL;
-
- SCM s = me->get_property ("elements");
- for (; scm_is_pair (s); s = scm_cdr (s))
+
+ extract_grob_set (me, "elements", elements);
+ for (vsize i = 0; i < elements.size (); i++)
{
- Grob * se = unsmob_grob (scm_car (s));
+ Grob *se = elements[i];
- SCM force = se->get_property ("force-hshift");
+ SCM force = se->get_property ("force-hshift");
if (scm_is_number (force))
- {
- tups = scm_cons (scm_cons (se->self_scm (), force),
- tups);
- }
+ tups = scm_cons (scm_cons (se->self_scm (), force),
+ tups);
}
return tups;
}
void
-Note_collision_interface::add_column (Grob*me,Grob* ncol)
+Note_collision_interface::add_column (Grob *me, Grob *ncol)
{
- ncol->add_offset_callback (Note_collision_interface::force_shift_callback_proc, X_AXIS);
+ ncol->set_property ("X-offset", Grob::x_parent_positioning_proc);
Axis_group_interface::add_element (me, ncol);
- me->add_dependency (ncol);
}
+vector<int>
+Note_collision_interface::note_head_positions (Grob *me)
+{
+ vector<int> out;
+ extract_grob_set (me, "elements", elts);
+ for (vsize i = 0; i < elts.size (); i++)
+ if (Grob *stem = unsmob<Grob> (elts[i]->get_object ("stem")))
+ {
+ vector<int> nhp = Stem::note_head_positions (stem);
+ out.insert (out.end (), nhp.begin (), nhp.end ());
+ }
-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}."
+ vector_sort (out, less<int> ());
+ return out;
+}
- ,
-
- "merge-differently-dotted merge-differently-headed positioning-done");
+ADD_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}.",
+
+ /* properties */
+ "merge-differently-dotted "
+ "merge-differently-headed "
+ "note-collision-threshold "
+ "positioning-done "
+ "prefer-dotted-right "
+ );
projects / lilypond.git / blobdiff