source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "note-collision.hh"
#include "note-head.hh"
#include "output-def.hh"
#include "pointer-group-interface.hh"
+#include "item.hh"
#include "rhythmic-head.hh"
+#include "staff-symbol-referencer.hh"
#include "side-position-interface.hh"
#include "stem.hh"
#include "warn.hh"
if (!Note_column::get_stem (cu) || !Note_column::get_stem (cd))
return;
+ Drul_array<Grob*> 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);
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))
/* 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;
/*
else
shift_amount *= 0.17;
+ /*
+
+ */
+ if (full_collide
+ && dnball_type * upball_type == 0)
+ {
+ if (upball_type == 0 && dnball_type == 1)
+ shift_amount *= 1.25;
+ else if (upball_type == 0 && dnball_type == 2)
+ shift_amount *= 1.35;
+ else if (dnball_type == 0 && upball_type == 1)
+ shift_amount *= 0.7;
+ else if (dnball_type == 0 && upball_type == 2)
+ shift_amount *= 0.75;
+ }
+
+ /*
+ * 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
far to the right.
*/
if (Dot_column::has_interface (parent))
- Side_position_interface::add_support (parent, nu);
+ {
+ Grob *stem = unsmob_grob (nu->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]);
+ }
}
Direction d = UP;
}
-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);
+ Grob *me = unsmob_grob (smob);
+ me->set_property ("positioning-done", SCM_BOOL_T);
+
Drul_array<vector<Grob*> > cg = get_clash_groups (me);
Direction d = UP;
do
{
- for (vsize i = cg[d].size(); i--; )
+ for (vsize i = cg[d].size (); i--; )
{
/*
Trigger positioning
do
{
vector<Grob*> &clashes (clash_groups[d]);
- vector_sort (clashes, Note_column::shift_compare);
+ vector_sort (clashes, Note_column::shift_less);
}
while ((flip (&d)) != UP);
/** 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 < vector<Grob*>
- > clash_groups)
+ Drul_array<vector<Grob*> > clash_groups)
{
Drul_array < vector<int> > shifts;
SCM tups = SCM_EOL;
}
while ((flip (&d)) != UP);
+
+ /*
+ 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++)
+ {
+ Grob *stem = Note_column::get_stem (clash_groups[UP][j]);
+ Side_position_interface::add_support (dc, stem);
+ }
+ }
+
/*
Check if chords are meshing
*/
Axis_group_interface::add_element (me, ncol);
}
-ADD_INTERFACE (Note_collision_interface, "note-collision-interface",
+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 "
/* properties */
"merge-differently-dotted "
"merge-differently-headed "
- "positioning-done");
+ "positioning-done ");