if (end == r)
end_index = i;
}
+ if (end == INT_MAX)
+ end_index = breaks.size () - 1;
if (start_index == VPOS || end_index == VPOS)
{
return rank_1 < rank_2;
}
+static void
+add_boxes (Grob *me, Grob *x_common, Grob *y_common, vector<Box> *const boxes)
+{
+ if (Axis_group_interface::has_interface (me)
+ && Axis_group_interface::has_axis (me, Y_AXIS))
+ {
+ Grob_array *elements = unsmob_grob_array (me->get_object ("elements"));
+ if (elements)
+ for (vsize i = 0; i < elements->size (); i++)
+ add_boxes (elements->grob (i), x_common, y_common, boxes);
+ }
+ else
+ boxes->push_back (Box (me->extent (x_common, X_AXIS),
+ me->extent (y_common, Y_AXIS)));
+}
+
void
Axis_group_interface::skyline_spacing (Grob *me, vector<Grob*> elements)
{
vector_sort (elements, staff_priority_less);
Grob *x_common = common_refpoint_of_array (elements, me, X_AXIS);
Grob *y_common = common_refpoint_of_array (elements, me, Y_AXIS);
+ Real max_slope = robust_scm2double (me->get_property ("skyline-max-slope"), 4);
vsize i = 0;
vector<Box> boxes;
for (i = 0; i < elements.size ()
&& !scm_is_number (elements[i]->get_property ("outside-staff-priority")); i++)
- boxes.push_back (Box (elements[i]->extent (x_common, X_AXIS),
- elements[i]->extent (y_common, Y_AXIS)));
+ add_boxes (elements[i], x_common, y_common, &boxes);
-
- Drul_array<Skyline> skylines (Skyline (boxes, X_AXIS, DOWN),
- Skyline (boxes, X_AXIS, UP));
+ Drul_array<Skyline> skylines (Skyline (boxes, max_slope, X_AXIS, DOWN),
+ Skyline (boxes, max_slope, X_AXIS, UP));
for (; i < elements.size (); i++)
{
Direction dir = get_grob_direction (elements[i]);
Box b (elements[i]->extent (x_common, X_AXIS),
elements[i]->extent (y_common, Y_AXIS));
+ if (b[X_AXIS].is_empty () || b[Y_AXIS].is_empty ())
+ {
+ warning (_f ("outside-staff object %s has an empty extent", elements[i]->name ().c_str ()));
+ continue;
+ }
+
boxes.clear ();
boxes.push_back (b);
- Skyline other = Skyline (boxes, X_AXIS, -dir);
- Real dist = skylines[dir].distance (other);
+ Skyline other = Skyline (boxes, max_slope, X_AXIS, -dir);
+ Real padding = robust_scm2double (elements[i]->get_property ("outside-staff-padding"), 0.5);
+ Real dist = skylines[dir].distance (other) + padding;
if (dist > 0)
{
b.translate (Offset (0, dir*dist));
elements[i]->translate_axis (dir*dist, Y_AXIS);
}
- skylines[dir].insert (b, X_AXIS);
+ skylines[dir].insert (b, max_slope, X_AXIS);
}
}
"elements "
"common-refpoint-of-elements "
"pure-relevant-elements "
+ "skyline-max-slope "
"skyline-spacing "
"cached-pure-extents "
);