/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1997--2015 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
SCM
Dot_column::calc_positioning_done (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = Grob::unsmob (smob);
/*
Trigger note collision resolution first, since that may kill off
dots when merging.
*/
- if (Grob *collision = unsmob_grob (me->get_object ("note-collision")))
+ if (Grob *collision = Grob::unsmob (me->get_object ("note-collision")))
(void) collision->get_property ("positioning-done");
me->set_property ("positioning-done", SCM_BOOL_T);
vector<Grob *> dots
= extract_grob_array (me, "dots");
- vector<Grob *> main_heads;
- vector<Interval> allowed_y_positions;
+ vector<Grob *> parent_stems;
Real ss = 0;
Grob *commonx = me;
Grob *n = dots[i]->get_parent (Y_AXIS);
commonx = n->common_refpoint (commonx, X_AXIS);
- if (Grob *stem = unsmob_grob (n->get_object ("stem")))
+ if (Grob *stem = Grob::unsmob (n->get_object ("stem")))
{
commonx = stem->common_refpoint (commonx, X_AXIS);
if (Stem::first_head (stem) == n)
- {
- main_heads.push_back (n);
-
- // Get vertical interval of the chord's notehead positions.
- // We widen this interval since dots always sit between staff
- // lines. Be careful to make it work also for unusual
- // overrides of `NoteHead.Y-offset'.
- //
- // Possible solutions to improve this code (namely, to handle
- // the `staff-position' property also) -- in case there is
- // ever the desire or necessity to do so -- can be found in
- // the Rietveld comments at
- //
- // https://codereview.appspot.com/7319049
-
- Interval hp = Stem::head_positions (stem);
-
- int top = int (ceil (hp[UP]));
- if (Staff_symbol_referencer::on_line (stem, top))
- top += 1;
- hp[UP] = top;
-
- int bottom = int (floor (hp[DOWN]));
- if (Staff_symbol_referencer::on_line (stem, bottom))
- bottom -= 1;
- hp[DOWN] = bottom;
-
- allowed_y_positions.push_back (hp);
- }
+ 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++)
{
Box b (s->extent (commonx, X_AXIS), y);
boxes.push_back (b);
- if (Grob *stem = unsmob_grob (s->get_object ("stem")))
+ if (Grob *stem = Grob::unsmob (s->get_object ("stem")))
stems.insert (stem);
}
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 = Grob::unsmob (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 ())
problem.register_configuration (cfg);
- // If in a chord, remove dots which have vertical positions above or below
- // the topmost or bottommost note, respectively ([Gould], p. 56).
- // Note that a dot configuration can contain more than a single chord or
- // rest (the latter gets ignored).
- //
- // The dot positioning algorithm vertically shifts dots; it thus can
- // happen that, say, a dot of the upper voice's chord is positioned
- // beneath a note head of the lower voice's chord, while the dots of the
- // lower voice's chord are shifted down even more. We thus check all
- // vertical ranges for valid positions and not only the range of the dot's
- // parent chord.
- //
- // Do nothing if there is either no staff line, or no note head, or the
- // `chord-dots' property not set.
- Grob *st = Staff_symbol_referencer::get_staff_symbol (me);
- vsize num_positions = allowed_y_positions.size ();
- bool chord_dots = to_boolean (me->get_property ("chord-dots"));
-
- if (st && num_positions && chord_dots)
- {
- for (Dot_configuration::const_iterator i (cfg.begin ());
- i != cfg.end (); i++)
- {
- vsize j;
-
- for (j = 0; j < num_positions; j++)
- if (allowed_y_positions[j].contains (i->first))
- break;
-
- if (j == num_positions)
- {
- Grob *dot = i->second.dot_;
- Grob *n = dot->get_parent (Y_AXIS);
- if (n && Note_head::has_interface (n))
- dot->suicide ();
- }
- }
- }
-
for (Dot_configuration::const_iterator i (cfg.begin ());
i != cfg.end (); i++)
{
void
Dot_column::add_head (Grob *me, Grob *head)
{
- Grob *d = unsmob_grob (head->get_object ("dot"));
+ Grob *d = Grob::unsmob (head->get_object ("dot"));
if (d)
{
Side_position_interface::add_support (me, head);
" dots so they do not clash with staff lines.",
/* properties */
- "chord-dots "
- "direction "
+ "chord-dots-limit "
"dots "
- "note-collision "
"positioning-done "
+ "direction "
+ "note-collision "
);
projects / lilypond.git / blobdiff