X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=89d2648ae21400a4f889895ce7786e5d0b2b9ea8;hb=135160e533f93401b2a93a040efdf02d3880ae7f;hp=afe470251ccac043c57940e159483a4be3de383c;hpb=ea3bdda36fed658f4911486bc1a600a92d1b0ac8;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index afe470251c..89d2648ae2 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -14,6 +14,7 @@ #include "hara-kiri-group-spanner.hh" #include "grob-array.hh" #include "international.hh" +#include "system.hh" #include "warn.hh" /* @@ -60,7 +61,7 @@ Align_interface::stretch_after_break (SCM grob) for (vsize i = 0; i < elems.size (); i++) elems[i]->relative_coordinate (common, Y_AXIS); - SCM details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); + SCM details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); SCM extra_space_handle = scm_assoc (ly_symbol2scm ("fixed-alignment-extra-space"), details); Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle) @@ -123,28 +124,86 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) v.unite (Interval (where, where)); } - /* - TODO: support self-alignment-{Y, X} - */ for (vsize i = 0; i < translates.size (); i++) elems[i]->translate_axis (translates[i] - v.center (), a); } -/* - Hairy function to put elements where they should be. Can be tweaked - from the outside by setting extra-space in its - children - - We assume that the children the refpoints of the children are still - found at 0.0 -- we will fuck up with thresholds if children's - extents are already moved to locations such as (-16, -8), since the - dy needed to put things in a row doesn't relate to the distances - between original refpoints. - - TODO: maybe we should rethink and throw out thresholding altogether. - The original function has been taken over by - align_to_fixed_distance (). -*/ +/* for each grob, find its upper and lower skylines. If the grob has + an empty extent, delete it from the list instead. If the extent is + non-empty but there is no skyline available (or pure is true), just + create a flat skyline from the bounding box */ +static void +get_skylines (Grob *me, + vector *const elements, + Axis a, + bool pure, int start, int end, + vector *const ret) +{ + /* each child's skyline was calculated according to the common refpoint of its + elements. Here we need all the skylines to be positioned with respect to + a single refpoint, so we need the common refpoint of the common refpoints + of the elements of the children */ + vector child_refpoints; + for (vsize i = 0; i < elements->size (); i++) + { + extract_grob_set ((*elements)[i], "elements", child_elts); + Grob *child_common = common_refpoint_of_array (child_elts, (*elements)[i], other_axis (a)); + child_refpoints.push_back (child_common); + } + Grob *common_refpoint = common_refpoint_of_array (child_refpoints, me, other_axis (a)); + + for (vsize i = elements->size (); i--;) + { + Grob *g = (*elements)[i]; + Interval extent = g->maybe_pure_extent (g, a, pure, start, end); + Interval other_extent = pure ? Interval (-infinity_f, infinity_f) + : g->extent (common_refpoint, other_axis (a)); + Box b; + b[a] = extent; + b[other_axis (a)] = other_extent; + + if (extent.is_empty ()) + { + elements->erase (elements->begin () + i); + continue; + } + + Skyline_pair skylines; + if (!pure + && Skyline_pair::unsmob (g->get_property ("skylines"))) + skylines = *Skyline_pair::unsmob (g->get_property ("skylines")); + else + { + if (!pure) + programming_error ("no skylines for alignment-child\n"); + + skylines = Skyline_pair (b, 0, other_axis (a)); + } + + /* each skyline is calculated relative to (potentially) a different other_axis + coordinate. In order to compare the skylines effectively, we need to shift them + to some absolute reference point */ + if (!pure) + { + /* this is perhaps an abuse of minimum-?-extent: maybe we should create + another property? But it seems that the only (current) use of + minimum-Y-extent is to separate vertically-aligned elements */ + SCM min_extent = g->get_property (a == X_AXIS ? "minimum-X-extent" : "minimum-Y-extent"); + if (is_number_pair (min_extent)) + { + b[a] = ly_scm2interval (min_extent); + skylines.insert (b, 0, other_axis (a)); + } + + Real offset = child_refpoints[i]->relative_coordinate (common_refpoint, other_axis (a)); + skylines.shift (offset); + } + + + ret->push_back (skylines); + } + reverse (*ret); +} vector Align_interface::get_extents_aligned_translates (Grob *me, @@ -158,7 +217,10 @@ Align_interface::get_extents_aligned_translates (Grob *me, SCM line_break_details = SCM_EOL; if (a == Y_AXIS && me_spanner) { - line_break_details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); + if (pure) + line_break_details = get_root_system (me)->column (start)->get_property ("line-break-system-details"); + else + line_break_details = me_spanner->get_bound (LEFT)->get_property ("line-break-system-details"); if (!me->get_system () && !pure) me->warning (_ ("vertical alignment called before line-breaking.\n" @@ -169,94 +231,56 @@ Align_interface::get_extents_aligned_translates (Grob *me, Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); - Interval threshold = robust_scm2interval (me->get_property ("threshold"), - Interval (0, Interval::infinity ())); + vector elems (all_grobs); // writable copy + vector skylines; - vector dims; - vector elems; + get_skylines (me, &elems, a, pure, start, end, &skylines); - for (vsize i = 0; i < all_grobs.size (); i++) - { - Interval y = all_grobs[i]->maybe_pure_extent (all_grobs[i], a, pure, start, end); - if (!y.is_empty ()) - { - Grob *e = dynamic_cast (all_grobs[i]); - - elems.push_back (e); - dims.push_back (y); - } - } - - /* - Read self-alignment-X and self-alignment-Y. This may seem like - code duplication. (and really: it is), but this is necessary to - prevent ugly cyclic dependencies that arise when you combine - self-alignment on a child with alignment of children. - */ - SCM align ((a == X_AXIS) - ? me->get_property ("self-alignment-X") - : me->get_property ("self-alignment-Y")); - - Interval total; Real where = 0; - Real extra_space = 0.0; SCM extra_space_handle = scm_assq (ly_symbol2scm ("alignment-extra-space"), line_break_details); + Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle) + ? scm_cdr (extra_space_handle) + : SCM_EOL, + 0.0); - extra_space = robust_scm2double (scm_is_pair (extra_space_handle) - ? scm_cdr (extra_space_handle) - : SCM_EOL, - extra_space); - + Real padding = robust_scm2double (me->get_property ("padding"), 0.0); vector translates; for (vsize j = 0; j < elems.size (); j++) { - Real dy = -dims[j][-stacking_dir]; - if (j) - dy += dims[j - 1][stacking_dir]; - - /* - we want dy to be > 0 - */ - dy *= stacking_dir; - if (j) - dy = min (max (dy, threshold[SMALLER]), threshold[BIGGER]); + Real dy = 0; + if (j == 0) + dy = skylines[j][-stacking_dir].max_height (); + else + dy = skylines[j-1][stacking_dir].distance (skylines[j][-stacking_dir]); - where += stacking_dir * (dy + extra_space / elems.size ()); - total.unite (dims[j] + where); + where += stacking_dir * max (0.0, dy + padding + extra_space / elems.size ()); translates.push_back (where); } - SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"), line_break_details); + SCM offsets_handle = scm_assq (ly_symbol2scm ("alignment-offsets"), + line_break_details); if (scm_is_pair (offsets_handle)) { vsize i = 0; - for (SCM s = scm_cdr (offsets_handle); scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++) + for (SCM s = scm_cdr (offsets_handle); + scm_is_pair (s) && i < translates.size (); s = scm_cdr (s), i++) { if (scm_is_number (scm_car (s))) translates[i] = scm_to_double (scm_car (s)); } } - - Real center_offset = 0.0; - - /* - also move the grobs that were empty, to maintain spatial order. - */ vector all_translates; - if (translates.size ()) + + if (!translates.empty ()) { Real w = translates[0]; - - if (scm_is_number (align)) - center_offset = total.linear_combination (scm_to_double (align)); - for (vsize i = 0, j = 0; j < all_grobs.size (); j++) { if (i < elems.size () && all_grobs[j] == elems[i]) w = translates[i++]; - all_translates.push_back (w - center_offset); + all_translates.push_back (w); } } return all_translates; @@ -269,8 +293,8 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) vector translates = get_extents_aligned_translates (me, all_grobs, a, false, 0, 0); if (translates.size ()) - for (vsize j = 0; j < all_grobs.size (); j++) - all_grobs[j]->translate_axis (translates[j], a); + for (vsize j = 0; j < all_grobs.size (); j++) + all_grobs[j]->translate_axis (translates[j], a); } Real @@ -306,7 +330,7 @@ Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, in return 0; } - programming_error (_ ("tried to get a translation for something that isn't my child")); + programming_error (_ ("tried to get a translation for something that is no child of mine")); return 0; } @@ -323,7 +347,7 @@ Align_interface::add_element (Grob *me, Grob *element) SCM sym = axis_offset_symbol (a); SCM proc = axis_parent_positioning (a); - element->internal_set_property (sym, proc); + element->set_property (sym, proc); Axis_group_interface::add_element (me, element); } @@ -362,7 +386,6 @@ find_fixed_alignment_parent (Grob *g) } ADD_INTERFACE (Align_interface, - "align-interface", "Order grobs from top to bottom, left to right, right to left or bottom " "to top. " @@ -375,15 +398,12 @@ ADD_INTERFACE (Align_interface, /* properties */ + "align-dir " + "axes " + "elements " "forced-distance " + "padding " + "positioning-done " "stacking-dir " - "align-dir " "threshold " - "positioning-done " - "elements axes"); - -struct Foobar -{ - bool has_interface (Grob *); -}; - + );