/*
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
= extract_grob_array (me, "dots");
vector<Grob *> main_heads;
+ vector<Interval> allowed_y_positions;
Real ss = 0;
Grob *commonx = me;
commonx = stem->common_refpoint (commonx, X_AXIS);
if (Stem::first_head (stem) == n)
- main_heads.push_back (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);
+ }
}
}
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);
i != stems.end (); i++)
{
Grob *stem = (*i);
- Stencil flag = Stem::flag (stem);
- if (!flag.is_empty ())
+ Grob *flag = Stem::flag (stem);
+ if (flag)
{
- Interval y = flag.extent (Y_AXIS)
- * (2 / ss)
- + Stem::stem_end_position (stem);
-
- Interval x = stem->relative_coordinate (commonx, X_AXIS)
- + flag.extent (X_AXIS);
+ 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);
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);
}
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++)
{
/*
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 "
+ "direction "
"dots "
+ "note-collision "
"positioning-done "
- "direction "
);
projects / lilypond.git / blobdiff