source file of the GNU LilyPond music typesetter
- (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "dot-column.hh"
Dot_column::side_position (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Grob *stem = unsmob_grob (me->get_object ("stem"));
- if (stem
- && !Stem::get_beam (stem)
- && Stem::duration_log (stem) > 2
- && !Stem::is_invisible (stem))
+ extract_grob_set (me, "dots", dots);
+
+ for (vsize i = 0; i < dots.size (); i++)
{
- /*
- trigger stem end & direction calculation.
-
- This will add the stem to the support if a flag collision happens.
- */
- stem->get_property ("stem-end-position");
+ Grob *head = dots[i]->get_parent (Y_AXIS);
+ Grob *stem = head ? unsmob_grob (head->get_object ("stem")) : 0;
+ if (stem
+ && !Stem::get_beam (stem)
+ && Stem::duration_log (stem) > 2
+ && !Stem::is_invisible (stem))
+ {
+ /*
+ trigger stem end & direction calculation.
+
+ This will add the stem to the support if a flag collision happens.
+ */
+ stem->get_property ("stem-end-position");
+ }
}
-
+
return Side_position_interface::x_aligned_side (smob);
}
int p = i->first;
if (p == k)
{
- if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+ if (Staff_symbol_referencer::on_line (i->second.dot_, p))
p += d;
else
p += 2* d;
int p = i->first;
if (p == k)
{
- if (Staff_symbol_referencer::on_staffline (i->second.dot_, p))
+ if (Staff_symbol_referencer::on_line (i->second.dot_, p))
p += d;
else
p += 2* d;
Dot_column::calc_positioning_done (SCM smob)
{
Grob *me = unsmob_grob (smob);
- Link_array<Grob> dots
+ vector<Grob*> dots
= extract_grob_array (me, "dots");
{ /*
dots when merging.
*/
Grob *c = 0;
- for (int i = dots.size (); i--;)
+ for (vsize i = dots.size (); i--;)
{
Grob *n = dots[i]->get_parent (Y_AXIS);
if (c)
else
c = n;
}
- for (int i = dots.size (); i--;)
+ for (vsize i = dots.size (); i--;)
{
Grob *n = dots[i]->get_parent (Y_AXIS);
n->relative_coordinate (c, X_AXIS);
}
}
- dots.sort (compare_position);
- for (int i = dots.size (); i--;)
+ vector_sort (dots, &compare_position);
+ for (vsize i = dots.size (); i--;)
if (!dots[i]->is_live ())
- dots.del (i);
+ dots.erase (dots.begin () + i);
Dot_configuration cfg;
- for (int i = 0;i < dots.size (); i++)
+ for (vsize i = 0;i < dots.size (); i++)
{
Dot_position dp;
dp.dot_ = dots[i];
remove_collision (cfg, p);
cfg[p] = dp;
- if (Staff_symbol_referencer::on_staffline (dp.dot_, p))
+ if (Staff_symbol_referencer::on_line (dp.dot_, p))
remove_collision (cfg, p);
}
"clash with staff lines ",
/* properties */
+ "dots "
"positioning-done "
"direction "
- "stem");
+ );