SCM
Dot_column::calc_positioning_done (SCM smob)
{
- Grob *me = unsmob_grob (smob);
+ Grob *me = unsmob_grob (smob);
/*
Trigger note collision resolution first, since that may kill off
me->set_property ("positioning-done", SCM_BOOL_T);
- vector<Grob*> dots
+ vector<Grob *> dots
= extract_grob_array (me, "dots");
- vector<Grob*> main_heads;
+ vector<Grob *> main_heads;
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")))
- {
- commonx = stem->common_refpoint (commonx, X_AXIS);
-
- if (Stem::first_head (stem) == n)
- main_heads.push_back (n);
- }
+
+ if (Grob *stem = unsmob_grob (n->get_object ("stem")))
+ {
+ commonx = stem->common_refpoint (commonx, X_AXIS);
+
+ if (Stem::first_head (stem) == n)
+ main_heads.push_back (n);
+ }
}
vector<Box> boxes;
- set<Grob*> stems;
+ set<Grob *> stems;
- extract_grob_set(me, "side-support-elements", support);
+ 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 < support.size (); i++)
{
Grob *s = support[i];
if (!ss)
- ss = Staff_symbol_referencer::staff_space (s);
+ ss = Staff_symbol_referencer::staff_space (s);
/* can't inspect Y extent of rest.
-
- Rest collisions should wait after line breaking.
+
+ Rest collisions should wait after line breaking.
*/
Interval y;
if (Rest::has_interface (s))
- {
- base_x.unite (s->extent (commonx, X_AXIS));
- continue;
- }
+ {
+ base_x.unite (s->extent (commonx, X_AXIS));
+ continue;
+ }
else if (Stem::has_interface (s))
- {
- Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
- Real y2 = y1 + get_grob_direction (s) * 7;
+ {
+ Real y1 = Stem::head_positions (s)[-get_grob_direction (s)];
+ Real y2 = y1 + get_grob_direction (s) * 7;
- y.add_point (y1);
- y.add_point (y2);
- }
+ y.add_point (y1);
+ y.add_point (y2);
+ }
else if (Note_head::has_interface (s))
- y = Interval (-1, 1);
+ y = Interval (-1, 1);
else
- {
- programming_error ("unknown grob in dot col support");
- continue;
- }
+ {
+ programming_error ("unknown grob in dot col support");
+ continue;
+ }
y *= 2 / ss;
y += Staff_symbol_referencer::get_position (s);
boxes.push_back (b);
if (Grob *stem = unsmob_grob (s->get_object ("stem")))
- stems.insert (stem);
+ stems.insert (stem);
}
- for (set<Grob*>::const_iterator i (stems.begin());
+ for (set<Grob *>::const_iterator i (stems.begin ());
i != stems.end (); i++)
{
Grob *stem = (*i);
Stencil flag = Stem::flag (stem);
if (!flag.is_empty ())
- {
- Interval y = flag.extent (Y_AXIS)
- * (2 / ss)
- + Stem::stem_end_position (stem);
+ {
+ 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);
+ Interval x = stem->relative_coordinate (commonx, X_AXIS)
+ + flag.extent (X_AXIS);
- boxes.push_back (Box (x,y));
- }
+ boxes.push_back (Box (x, y));
+ }
}
-
+
vector_sort (dots, position_less);
for (vsize i = dots.size (); i--;)
{
if (!dots[i]->is_live ())
- dots.erase (dots.begin () + i);
+ dots.erase (dots.begin () + i);
else
- // Undo any fake translations that were done in add_head.
- dots[i]->translate_axis (-dots[i]->relative_coordinate (me, X_AXIS), X_AXIS);
+ // Undo any fake translations that were done in add_head.
+ dots[i]->translate_axis (-dots[i]->relative_coordinate (me, X_AXIS), X_AXIS);
}
Dot_formatting_problem problem (boxes, base_x);
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;
-
- dp.x_extent_ = note->extent (commonx, X_AXIS);
- }
+ {
+ Grob *stem = unsmob_grob (note->get_object ("stem"));
+ if (stem)
+ dp.extremal_head_ = Stem::first_head (stem) == note;
+
+ dp.x_extent_ = note->extent (commonx, X_AXIS);
+ }
int p = Staff_symbol_referencer::get_rounded_position (dp.dot_);
/* icky, since this should go via a Staff_symbol_referencer
- offset callback but adding a dot overwrites Y-offset. */
+ 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"));
+ 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))
- cfg.remove_collision (p);
+ cfg.remove_collision (p);
}
problem.register_configuration (cfg);
i != cfg.end (); i++)
{
/*
- Junkme?
+ Junkme?
*/
Staff_symbol_referencer::set_position (i->second.dot_, i->first);
}
-
+
me->translate_axis (cfg.x_offset () - me->relative_coordinate (commonx, X_AXIS),
- X_AXIS);
+ X_AXIS);
return SCM_BOOL_T;
}
// The translation here is undone in calc_positioning_done, where we
// do the X-offset properly.
if (Rest::has_interface (head))
- d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS);
+ d->translate_axis (head->extent (head, X_AXIS).length (), X_AXIS);
else
- d->set_property ("X-offset", Grob::x_parent_positioning_proc);
+ d->set_property ("X-offset", Grob::x_parent_positioning_proc);
Axis_group_interface::add_element (me, d);
}
}
ADD_INTERFACE (Dot_column,
- "Group dot objects so they form a column, and position"
- " dots so they do not clash with staff lines.",
-
- /* properties */
- "dots "
- "positioning-done "
- "direction "
- );
+ "Group dot objects so they form a column, and position"
+ " dots so they do not clash with staff lines.",
+
+ /* properties */
+ "dots "
+ "positioning-done "
+ "direction "
+ );
projects / lilypond.git / blobdiff