/*
- 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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
- (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.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"
Drul_array<vector<Grob*> > const &clash_groups)
{
- if (!extents[UP].size () || ! extents[DOWN].size ())
+ if (!extents[UP].size () || !extents[DOWN].size ())
return;
Grob *clash_up = clash_groups[UP][0];
Drul_array<Grob*> stems (Note_column::get_stem (clash_down),
Note_column::get_stem (clash_up));
-
+
Grob *head_up = Note_column::first_head (clash_up);
Grob *head_down = Note_column::first_head (clash_down);
vector<int> ups = Stem::note_head_positions (Note_column::get_stem (clash_up));
vector<int> dps = Stem::note_head_positions (Note_column::get_stem (clash_down));
- /* Too far apart to collide. */
+ /* Too far apart to collide. */
if (ups[0] > dps.back () + 1)
return;
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). */
+ /* 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;
&& !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
&& up_ball_type != down_ball_type
&& !to_boolean (me->get_property ("merge-differently-headed")))
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;
-
Real shift_amount = 1;
bool touch = (ups[0] >= dps.back ());
shift_amount *= -1;
/* For full collisions, the right hand head may obscure dots, so
- make sure the dotted heads go to the right. */
+ make sure the dotted heads go to the right. */
bool stem_to_stem = false;
if (full_collide)
{
}
/* The solfa is a triangle, which is inverted depending on stem
- direction. In case of a collision, one of them should be removed,
+ 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
- && head_up->get_property ("style") == ly_symbol2scm ("fa")
- && head_down->get_property ("style") == ly_symbol2scm ("fa"))
+ && (up_style == ly_symbol2scm ("fa") || up_style == ly_symbol2scm ("faThin"))
+ && (down_style == ly_symbol2scm ("fa") || down_style == ly_symbol2scm ("faThin")))
{
Interval uphead_size = head_up->extent (head_up, Y_AXIS);
Offset att = Offset (0.0, -1.0);
head_up->set_property ("stem-attachment", ly_offset2scm (att));
- head_up->set_property ("transparent", SCM_BOOL_T);
+ head_up->set_property ("transparent", SCM_BOOL_T);
}
-
+
if (merge_possible)
{
shift_amount = 0;
- /* If possible, don't wipe any heads. Else, wipe shortest head,
+ /* 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. */
Grob *wipe_ball = 0;
{
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 - head_up->extent (head_up, X_AXIS).length () /
+ head_down->extent (head_down, X_AXIS).length ()) * 0.5;
}
if (dot_wipe_head)
}
if (wipe_ball && wipe_ball->is_live ())
- {
- wipe_ball->set_property ("transparent", SCM_BOOL_T);
- }
+ 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)
else if (distant_half_collide || close_half_collide || full_collide)
shift_amount *= 0.5;
- /* we're meshing. */
+ /* 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.17;
/*
-
+
*/
if (full_collide
&& down_ball_type * up_ball_type == 0)
else if (down_ball_type == 0 && up_ball_type == 2)
shift_amount *= 0.75;
}
-
+
/*
* Fix issue #44:
*
{
Grob *staff = Staff_symbol_referencer::get_staff_symbol (me);
if (!Staff_symbol_referencer::on_line (staff, ups[0]))
- /*
- TODO: consider junking the else body.
- */
- if (to_boolean (me->get_property ("prefer-dotted-right")))
- {
+ {
+ /*
+ TODO: consider junking the else body.
+ */
+ if (to_boolean (me->get_property ("prefer-dotted-right")))
shift_amount = 0.5;
- }
- else
- {
- 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);
- }
+ else
+ {
+ 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);
+ }
+ }
}
/* For full or close half collisions, the right hand head may
- obscure dots. Move dots to the right. */
+ obscure dots. Move dots to the right. */
if (abs (shift_amount) > 1e-6
&& Rhythmic_head::dot_count (head_down) > Rhythmic_head::dot_count (head_up)
&& (full_collide || close_half_collide))
}
-MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1)
+MAKE_SCHEME_CALLBACK (Note_collision_interface, calc_positioning_done, 1)
SCM
Note_collision_interface::calc_positioning_done (SCM smob)
{
Grob *me = unsmob_grob (smob);
me->set_property ("positioning-done", SCM_BOOL_T);
-
+
Drul_array<vector<Grob*> > clash_groups = get_clash_groups (me);
Direction d = UP;
{
/*
Trigger positioning
- */
+ */
clash_groups[d][i]->extent (me, X_AXIS);
}
}
if (Note_column::has_interface (se))
{
if (!Note_column::dir (se))
- {
- se->programming_error ("note-column has no direction");
- }
+ se->programming_error ("note-column has no direction");
else
clash_groups[Note_column::dir (se)].push_back (se);
}
return clash_groups;
}
-/** This complicated routine moves note columns around horizontally to
- ensure that notes don't clash.
-
+/*
+ This complicated routine moves note columns around horizontally to
+ ensure that notes don't clash.
*/
SCM
Note_collision_interface::automatic_shift (Grob *me,
/*
see input/regression/dot-up-voice-collision.ly
- */
+ */
for (vsize i = 0; i < clash_groups[UP].size (); i++)
{
Grob *g = clash_groups[UP][i];
Grob *dc = Note_column::dot_column (g);
-
+
if (dc)
for (vsize j = i + 1; j < clash_groups[UP].size (); j++)
{
Side_position_interface::add_support (dc, stem);
}
}
-
+
/*
Check if chords are meshing
*/
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;
}
projects / lilypond.git / blobdiff