X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=e52e8f69ff7c1891609d153ce0e2025097a5469d;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=b9335706d0fdc7ec9e05b0e7b282fed10925c905;hpb=694efc33f008579da59244d81e1525b61a74e3cf;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index b9335706d0..e52e8f69ff 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2006 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ #include "align-interface.hh" @@ -13,6 +13,10 @@ #include "pointer-group-interface.hh" #include "hara-kiri-group-spanner.hh" #include "grob-array.hh" +#include "international.hh" +#include "system.hh" +#include "warn.hh" +#include "paper-column.hh" /* TODO: for vertical spacing, should also include a rod & spring @@ -27,7 +31,7 @@ Align_interface::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); SCM axis = scm_car (me->get_property ("axes")); - Axis ax = (Axis)scm_to_int (axis); + Axis ax = Axis (scm_to_int (axis)); SCM force = me->get_property ("forced-distance"); if (scm_is_number (force)) @@ -49,15 +53,16 @@ Align_interface::stretch_after_break (SCM grob) Spanner *me_spanner = dynamic_cast (me); extract_grob_set (me, "elements", elems); + if (me_spanner && elems.size ()) { Grob *common = common_refpoint_of_array (elems, me, Y_AXIS); /* force position callbacks */ - for (int i = 0; i < elems.size (); i++) + 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) @@ -68,7 +73,7 @@ Align_interface::stretch_after_break (SCM grob) Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); Real delta = extra_space / elems.size() * stacking_dir; - for (int i = 0; i < elems.size (); i++) + for (vsize i = 0; i < elems.size (); i++) elems[i]->translate_axis (i * delta, Y_AXIS); } @@ -88,15 +93,15 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) extract_grob_set (me, "elements", elem_source); - Link_array elems (elem_source); // writable.. + vector elems (elem_source); // writable.. - Real where_f = 0; + Real where = 0; Interval v; v.set_empty (); - Array translates; + vector translates; - for (int j = elems.size (); j--;) + for (vsize j = elems.size (); j--;) { /* This is not very elegant, in that we need special support for @@ -110,153 +115,256 @@ Align_interface::align_to_fixed_distance (Grob *me, Axis a) Hara_kiri_group_spanner::consider_suicide (elems[j]); if (!elems[j]->is_live ()) - elems.del (j); + elems.erase (elems.begin () + j); } - for (int j = 0; j < elems.size (); j++) + for (vsize j = 0; j < elems.size (); j++) { - where_f += stacking_dir * dy; - translates.push (where_f); - v.unite (Interval (where_f, where_f)); + where += stacking_dir * dy; + translates.push_back (where); + v.unite (Interval (where, where)); } - /* - TODO: support self-alignment-{Y, X} - */ - for (int i = 0; i < translates.size (); i++) + 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++) + { + Grob *elt = (*elements)[i]; + Grob *child_common = unsmob_grob ((a == Y_AXIS) + ? elt->get_object ("X-common") + : elt->get_object ("Y-common")); + + if (!child_common) + { + extract_grob_set (elt, "elements", child_elts); + child_common = common_refpoint_of_array (child_elts, elt, 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; + } -void -Align_interface::align_elements_to_extents (Grob *me, Axis a) + 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, + vector const &all_grobs, + Axis a, + bool pure, int start, int end) { Spanner *me_spanner = dynamic_cast (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" + "Only do cross-staff spanners with PianoStaff.")); + + } Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); - Interval threshold = robust_scm2interval (me->get_property ("threshold"), - Interval (0, Interval::infinity ())); - - Array dims; - Link_array elems; - - extract_grob_set (me, "elements", all_grobs); - for (int i = 0; i < all_grobs.size (); i++) - { - Interval y = all_grobs[i]->extent (me, a); - if (!y.is_empty ()) - { - Grob *e = dynamic_cast (all_grobs[i]); + vector elems (all_grobs); // writable copy + vector skylines; - elems.push (e); - dims.push (y); - } - } + get_skylines (me, &elems, a, pure, start, end, &skylines); - /* - 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); - - extra_space = robust_scm2double (scm_is_pair (extra_space_handle) - ? scm_cdr (extra_space_handle) - : SCM_EOL, - extra_space); - - Array translates; - for (int j = 0; j < elems.size (); j++) + Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle) + ? scm_cdr (extra_space_handle) + : SCM_EOL, + 0.0); + + 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]); - - where += stacking_dir * (dy + extra_space / elems.size ()); - total.unite (dims[j] + where); - translates.push (where); + 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 * 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)) { - int i = 0; + 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. - */ - Array all_translates; - if (translates.size ()) + vector all_translates; + + if (!translates.empty ()) { - int i = 0; - int j = 0; Real w = translates[0]; - while (j < all_grobs.size ()) + 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 (w); - j++; + all_translates.push_back (w); } + } + return all_translates; +} - /* - FIXME: uncommenting freaks out the Y-alignment of - line-of-score. - */ - if (scm_is_number (align)) - center_offset = total.linear_combination (scm_to_double (align)); +void +Align_interface::align_elements_to_extents (Grob *me, Axis a) +{ + extract_grob_set (me, "elements", all_grobs); + + 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 (int j = 0; j < all_grobs.size (); j++) - all_grobs[j]->translate_axis (all_translates[j] - center_offset, a); +/* After we have already determined the y-offsets of our children, we may still + want to stretch them a little. */ +void +Align_interface::stretch (Grob *me, Real amount, Axis a) +{ + extract_grob_set (me, "elements", elts); + Real non_empty_elts = 0.0; + for (vsize i = 0; i < elts.size (); i++) + non_empty_elts += !elts[i]->extent (me, a).is_empty (); + + Real offset = 0.0; + Direction dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); + for (vsize i = 0; i < elts.size (); i++) + { + elts[i]->translate_axis (dir * offset, a); + if (!elts[i]->extent (me, a).is_empty ()) + offset += amount / non_empty_elts; } + me->flush_extent_cache (Y_AXIS); } + +Real +Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end) +{ + extract_grob_set (me, "elements", all_grobs); + SCM dy_scm = me->get_property ("forced-distance"); + + if (scm_is_number (dy_scm)) + { + Real dy = scm_to_double (dy_scm) * robust_scm2dir (me->get_property ("stacking-dir"), DOWN); + Real pos = 0; + for (vsize i = 0; i < all_grobs.size (); i++) + { + if (all_grobs[i] == ch) + return pos; + if (!Hara_kiri_group_spanner::has_interface (all_grobs[i]) + || !Hara_kiri_group_spanner::request_suicide (all_grobs[i], start, end)) + pos += dy; + } + } + else + { + vector translates = get_extents_aligned_translates (me, all_grobs, Y_AXIS, true, start, end); + + if (translates.size ()) + { + for (vsize i = 0; i < all_grobs.size (); i++) + if (all_grobs[i] == ch) + return translates[i]; + } + else + return 0; + } + + programming_error (_ ("tried to get a translation for something that is no child of mine")); + return 0; +} + Axis Align_interface::axis (Grob *me) { @@ -270,7 +378,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); } @@ -289,6 +397,31 @@ Align_interface::set_ordered (Grob *me) ga->set_ordered (true); } +MAKE_SCHEME_CALLBACK (Align_interface, calc_max_stretch, 1) +SCM +Align_interface::calc_max_stretch (SCM smob) +{ + Grob *me = unsmob_grob (smob); + Spanner *spanner_me = dynamic_cast (me); + Real ret = 0; + + if (spanner_me) + { + Paper_column *left = dynamic_cast (spanner_me->get_bound (LEFT)); + Real height = me->extent (me, Y_AXIS).length (); + SCM line_break_details = left->get_property ("line-break-system-details"); + SCM fixed_offsets = scm_assq (ly_symbol2scm ("alignment-offsets"), + line_break_details); + + /* if there are fixed offsets, we refuse to stretch */ + if (fixed_offsets != SCM_BOOL_F) + ret = 0; + else + ret = height * height / 80.0; /* why this, exactly? -- jneem */ + } + return scm_from_double (ret); +} + /* Find Y-axis parent of G that has a #'forced-distance property. This has the effect of finding the piano-staff given an object in that @@ -309,7 +442,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. " @@ -322,15 +454,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 *); -}; - + );