/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2012 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
vector<Grob *> dots
= extract_grob_array (me, "dots");
- vector<Grob *> main_heads;
+ vector<Grob *> parent_stems;
Real ss = 0;
Grob *commonx = me;
commonx = stem->common_refpoint (commonx, X_AXIS);
if (Stem::first_head (stem) == n)
- main_heads.push_back (n);
+ parent_stems.push_back (stem);
}
}
extract_grob_set (me, "side-support-elements", support);
Interval base_x;
- for (vsize i = 0; i < main_heads.size (); i++)
- base_x.unite (main_heads[i]->extent (commonx, X_AXIS));
+ for (vsize i = 0; i < parent_stems.size (); i++)
+ base_x.unite (Stem::first_head (parent_stems[i])->extent (commonx, X_AXIS));
for (vsize i = 0; i < support.size (); i++)
{
y.add_point (y1);
y.add_point (y2);
+
+ stems.insert (s);
}
else if (Note_head::has_interface (s))
- y = Interval (-1, 1);
+ y = Interval (-1.1, 1.1);
else
{
programming_error ("unknown grob in dot col support");
continue;
}
- y *= 2 / ss;
y += Staff_symbol_referencer::get_position (s);
Box b (s->extent (commonx, X_AXIS), y);
{
Grob *commony = stem->common_refpoint (flag, Y_AXIS);
Interval y = flag->extent (commony, Y_AXIS) * (2 / ss);
-
Interval x = flag->extent (commonx, X_AXIS);
boxes.push_back (Box (x, y));
}
}
- vector_sort (dots, position_less);
+ /*
+ The use of pure_position_less and pure_get_rounded_position below
+ are due to the fact that this callback is called before line breaking
+ occurs. Because dots' actual Y posiitons may be linked to that of
+ beams (dots are attached to rests, which are shifted to avoid beams),
+ we instead must use their pure Y positions.
+ */
+ vector_sort (dots, pure_position_less);
+
+ SCM chord_dots_limit = me->get_property ("chord-dots-limit");
+ if (scm_is_number (chord_dots_limit))
+ {
+ // Sort dots by stem, then check for dots above the limit for each stem
+ vector <vector <Grob *> > dots_each_stem (parent_stems.size ());
+ for (vsize i = 0; i < dots.size (); i++)
+ if (Grob *stem = unsmob_grob (dots[i]->get_parent (Y_AXIS)
+ -> get_object ("stem")))
+ for (vsize j = 0; j < parent_stems.size (); j++)
+ if (stem == parent_stems[j])
+ {
+ dots_each_stem[j].push_back (dots[i]);
+ break;
+ }
+ for (vsize j = 0; j < parent_stems.size (); j++)
+ {
+ Interval chord = Stem::head_positions (parent_stems[j]);
+ int total_room = ((int) chord.length () + 2
+ + scm_to_int (chord_dots_limit)) / 2;
+ int total_dots = dots_each_stem[j].size ();
+ // remove excessive dots from the ends of the stem
+ for (int first_dot = 0; total_dots > total_room; total_dots--)
+ if (0 == (total_dots - total_room) % 2)
+ dots_each_stem[j][first_dot++]->suicide ();
+ else
+ dots_each_stem[j][first_dot + total_dots - 1]->suicide ();
+ }
+ }
+
for (vsize i = dots.size (); i--;)
{
if (!dots[i]->is_live ())
Grob *note = dots[i]->get_parent (Y_AXIS);
if (note)
{
- Grob *stem = unsmob_grob (note->get_object ("stem"));
- if (stem)
- dp.extremal_head_ = Stem::first_head (stem) == note;
+ if (Note_head::has_interface (note))
+ dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
dp.x_extent_ = note->extent (commonx, X_AXIS);
}
- int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
+ int p = Staff_symbol_referencer::pure_get_rounded_position (dp.dot_);
/* icky, since this should go via a Staff_symbol_referencer
offset callback but adding a dot overwrites Y-offset. */
p += (int) robust_scm2double (dp.dot_->get_property ("staff-position"), 0.0);
dp.pos_ = p;
- if (dp.extremal_head_)
- dp.dir_ = to_dir (dp.dot_->get_property ("direction"));
cfg.remove_collision (p);
cfg[p] = dp;
- if (Staff_symbol_referencer::on_line (dp.dot_, p))
+ if (Staff_symbol_referencer::on_line (dp.dot_, p) &&
+ dp.dot_->get_property ("style") != ly_symbol2scm ("kievan"))
cfg.remove_collision (p);
}
/*
Junkme?
*/
- Staff_symbol_referencer::set_position (i->second.dot_, i->first);
+ Staff_symbol_referencer::pure_set_position (i->second.dot_, i->first);
}
me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS),
" dots so they do not clash with staff lines.",
/* properties */
+ "chord-dots-limit "
"dots "
"positioning-done "
"direction "
+ "note-collision "
);