X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faxis-group-interface.cc;h=9149f667bc42443cee407e82373b8078af67ae64;hb=c750e9b0ef41267a9b6be0300c880047f48b9353;hp=d74bf880e6d1f1a2e3c495adb180a98a01e52069;hpb=1bf2062b6126102e7e66ed954a3be9906894ec1b;p=lilypond.git diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index d74bf880e6..9149f667bc 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -9,14 +9,14 @@ #include "axis-group-interface.hh" #include "align-interface.hh" +#include "directional-element-interface.hh" #include "pointer-group-interface.hh" -#include "grob.hh" #include "grob-array.hh" #include "hara-kiri-group-spanner.hh" #include "international.hh" -#include "item.hh" #include "paper-column.hh" #include "paper-score.hh" +#include "separation-item.hh" #include "system.hh" #include "warn.hh" @@ -34,10 +34,10 @@ Axis_group_interface::add_element (Grob *me, Grob *e) if (!e->get_parent (a)) e->set_parent (me, a); - e->internal_set_object ((a == X_AXIS) - ? ly_symbol2scm ("axis-group-parent-X") - : ly_symbol2scm ("axis-group-parent-Y"), - me->self_scm ()); + e->set_object ((a == X_AXIS) + ? ly_symbol2scm ("axis-group-parent-X") + : ly_symbol2scm ("axis-group-parent-Y"), + me->self_scm ()); } /* must be ordered, because Align_interface also uses @@ -88,6 +88,8 @@ Axis_group_interface::cached_pure_height (Grob *me, if (end == r) end_index = i; } + if (end == INT_MAX) + end_index = breaks.size () - 1; if (start_index == VPOS || end_index == VPOS) { @@ -182,6 +184,8 @@ SCM Axis_group_interface::generic_group_extent (Grob *me, Axis a) { extract_grob_set (me, "elements", elts); + if (a == Y_AXIS && to_boolean (me->get_property ("skyline-spacing"))) + skyline_spacing (me, elts); Grob *common = common_refpoint_of_array (elts, me, a); Real my_coord = me->relative_coordinate (common, a); @@ -251,7 +255,143 @@ Axis_group_interface::get_children (Grob *me, vector *found) } } -ADD_INTERFACE (Axis_group_interface, "axis-group-interface", +bool +staff_priority_less (Grob * const &g1, Grob * const &g2) +{ + int priority_1 = robust_scm2int (g1->get_property ("outside-staff-priority"), INT_MIN); + int priority_2 = robust_scm2int (g2->get_property ("outside-staff-priority"), INT_MIN); + + if (priority_1 < priority_2) + return true; + else if (priority_1 > priority_2) + return false; + + /* if there is no preference in staff priority, choose the left-most one */ + Grob *common = g1->common_refpoint (g2, X_AXIS); + Real start_1 = g1->extent (common, X_AXIS)[LEFT]; + Real start_2 = g2->extent (common, X_AXIS)[LEFT]; + return start_1 < start_2; +} + +static void +add_boxes (Grob *me, Grob *x_common, Grob *y_common, vector *const boxes) +{ + /* if we are a parent, consider the children's boxes instead of mine */ + if (Grob_array *elements = unsmob_grob_array (me->get_object ("elements"))) + { + for (vsize i = 0; i < elements->size (); i++) + add_boxes (elements->grob (i), x_common, y_common, boxes); + } + else if (!scm_is_number (me->get_property ("outside-staff-priority"))) + boxes->push_back (Box (me->extent (x_common, X_AXIS), + me->extent (y_common, Y_AXIS))); +} + +/* We want to avoid situations like this: + still more text + more text + text + ------------------- + staff + ------------------- + + The point is that "still more text" should be positioned under + "more text". In order to achieve this, we place the grobs in several + passes. We keep track of the right-most horizontal position that has been + affected by the current pass so far (actually we keep track of 2 + positions, one for above the staff, one for below). + + In each pass, we loop through the unplaced grobs from left to right. + If the grob overlaps the right-most affected position, we place it + (and then update the right-most affected position to point to the right + edge of the just-placed grob). Otherwise, we skip it until the next pass. +*/ +static void +add_grobs_of_one_priority (Drul_array *const skylines, + vector elements, + Grob *x_common, + Grob *y_common) +{ + vector boxes; + Drul_array last_affected_position; + + reverse (elements); + while (!elements.empty ()) + { + last_affected_position[UP] = -infinity_f; + last_affected_position[DOWN] = -infinity_f; + /* do one pass */ + for (vsize i = elements.size (); i--;) + { + Direction dir = get_grob_direction (elements[i]); + if (dir == CENTER) + { + warning (_ ("an outside-staff object should have a direction, defaulting to up")); + dir = UP; + } + + Box b (elements[i]->extent (x_common, X_AXIS), + elements[i]->extent (y_common, Y_AXIS)); + SCM horizon_padding_scm = elements[i]->get_property ("outside-staff-horizontal-padding"); + Real horizon_padding = robust_scm2double (horizon_padding_scm, 0.0); + + if (b[X_AXIS][LEFT] - 2*horizon_padding < last_affected_position[dir]) + continue; + + 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 ())); + else + { + boxes.clear (); + boxes.push_back (b); + Skyline other = Skyline (boxes, horizon_padding, 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, 0, X_AXIS); + elements[i]->del_property ("outside-staff-padding"); + last_affected_position[dir] = b[X_AXIS][RIGHT]; + } + elements.erase (elements.begin () + i); + } + } +} + +void +Axis_group_interface::skyline_spacing (Grob *me, vector 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); + + vsize i = 0; + vector boxes; + + for (i = 0; i < elements.size () + && !scm_is_number (elements[i]->get_property ("outside-staff-priority")); i++) + add_boxes (elements[i], x_common, y_common, &boxes); + + Drul_array skylines (Skyline (boxes, 0, X_AXIS, DOWN), + Skyline (boxes, 0, X_AXIS, UP)); + for (; i < elements.size (); i++) + { + SCM priority = elements[i]->get_property ("outside-staff-priority"); + vector current_elts; + current_elts.push_back (elements[i]); + while (i < elements.size () - 1 + && scm_eq_p (elements[i+1]->get_property ("outside-staff-priority"), priority)) + current_elts.push_back (elements[++i]); + + add_grobs_of_one_priority (&skylines, current_elts, x_common, y_common); + } +} + +ADD_INTERFACE (Axis_group_interface, "An object that groups other layout objects.", @@ -260,5 +400,6 @@ ADD_INTERFACE (Axis_group_interface, "axis-group-interface", "elements " "common-refpoint-of-elements " "pure-relevant-elements " + "skyline-spacing " "cached-pure-extents " );