X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=7f7b9c3cf645a9eb8df727129309f1039a29335d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=fc62e45eb3eba2b28ee5dbbfbb475897b5d40309;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index fc62e45eb3..7f7b9c3cf6 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,20 +3,21 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2007 Han-Wen Nienhuys + (c) 2000--2008 Han-Wen Nienhuys */ #include "align-interface.hh" -#include "spanner.hh" -#include "item.hh" #include "axis-group-interface.hh" -#include "pointer-group-interface.hh" -#include "hara-kiri-group-spanner.hh" #include "grob-array.hh" +#include "hara-kiri-group-spanner.hh" #include "international.hh" +#include "item.hh" +#include "paper-column.hh" +#include "pointer-group-interface.hh" +#include "spanner.hh" +#include "skyline-pair.hh" #include "system.hh" #include "warn.hh" -#include "paper-column.hh" /* TODO: for vertical spacing, should also include a rod & spring @@ -30,22 +31,21 @@ SCM Align_interface::calc_positioning_done (SCM smob) { Grob *me = unsmob_grob (smob); + + me->set_property ("positioning-done", SCM_BOOL_T); + SCM axis = scm_car (me->get_property ("axes")); Axis ax = Axis (scm_to_int (axis)); - SCM force = me->get_property ("forced-distance"); - if (scm_is_number (force)) - Align_interface::align_to_fixed_distance (me, ax); - else - Align_interface::align_elements_to_extents (me, ax); + Align_interface::align_elements_to_extents (me, ax); return SCM_BOOL_T; } /* - merge with align-to-extents? + TODO: This belongs to the old two-pass spacing. Delete me. */ -MAKE_SCHEME_CALLBACK(Align_interface, stretch_after_break, 1) +MAKE_SCHEME_CALLBACK (Align_interface, stretch_after_break, 1) SCM Align_interface::stretch_after_break (SCM grob) { @@ -72,7 +72,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; + Real delta = extra_space / elems.size () * stacking_dir; for (vsize i = 0; i < elems.size (); i++) elems[i]->translate_axis (i * delta, Y_AXIS); } @@ -80,55 +80,6 @@ Align_interface::stretch_after_break (SCM grob) return SCM_UNSPECIFIED; } -/* - merge with align-to-extents? -*/ -void -Align_interface::align_to_fixed_distance (Grob *me, Axis a) -{ - Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), - DOWN); - - Real dy = robust_scm2double (me->get_property ("forced-distance"), 0.0); - - extract_grob_set (me, "elements", elem_source); - - vector elems (elem_source); // writable.. - - Real where = 0; - - Interval v; - v.set_empty (); - vector translates; - - for (vsize j = elems.size (); j--;) - { - /* - This is not very elegant, in that we need special support for - hara-kiri. Unfortunately, the generic wiring of - force_hara_kiri_callback () (extent and offset callback) is - such that we might get into a loop if we call extent () or - offset () the elements. - */ - if (a == Y_AXIS - && Hara_kiri_group_spanner::has_interface (elems[j])) - Hara_kiri_group_spanner::consider_suicide (elems[j]); - - if (!elems[j]->is_live ()) - elems.erase (elems.begin () + j); - } - - for (vsize j = 0; j < elems.size (); j++) - { - where += stacking_dir * dy; - translates.push_back (where); - v.unite (Interval (where, where)); - } - - for (vsize i = 0; i < translates.size (); i++) - elems[i]->translate_axis (translates[i] - v.center (), a); -} - /* 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 @@ -140,77 +91,61 @@ get_skylines (Grob *me, 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)); + Grob *other_common = common_refpoint_of_array (*elements, 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) { + Skyline_pair *skys = Skyline_pair::unsmob (g->get_property (a == Y_AXIS + ? "vertical-skylines" + : "horizontal-skylines")); + if (skys) + skylines = *skys; + /* 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"); + SCM min_extent = g->get_property (a == X_AXIS + ? ly_symbol2scm ("minimum-X-extent") + : ly_symbol2scm ("minimum-Y-extent")); + if (is_number_pair (min_extent)) { + Box b; + Interval other_extent = g->extent (other_common, other_axis (a)); b[a] = ly_scm2interval (min_extent); - skylines.insert (b, 0, other_axis (a)); + b[other_axis (a)] = other_extent; + if (!other_extent.is_empty ()) + skylines.insert (b, 0, other_axis (a)); } - Real offset = child_refpoints[i]->relative_coordinate (common_refpoint, other_axis (a)); + /* This skyline was calculated relative to the grob g. In order to compare it to + skylines belonging to other grobs, we need to shift it so that it is relative + to the common reference. */ + Real offset = g->relative_coordinate (other_common, other_axis (a)); skylines.shift (offset); } + else + { + assert (a == Y_AXIS); + Interval extent = g->pure_height (g, start, end); + if (!extent.is_empty ()) + { + Box b; + b[a] = extent; + b[other_axis (a)] = Interval (-infinity_f, infinity_f); + skylines.insert (b, 0, other_axis (a)); + } + } - - ret->push_back (skylines); + if (skylines.is_empty ()) + elements->erase (elements->begin () + i); + else + ret->push_back (skylines); } reverse (*ret); } @@ -233,9 +168,7 @@ Align_interface::get_extents_aligned_translates (Grob *me, 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.")); - + me->programming_error ("vertical alignment called before line-breaking"); } Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), @@ -247,6 +180,7 @@ Align_interface::get_extents_aligned_translates (Grob *me, get_skylines (me, &elems, a, pure, start, end, &skylines); Real where = 0; + /* TODO: extra-space stuff belongs to two-pass spacing. Delete me */ 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) @@ -255,15 +189,24 @@ Align_interface::get_extents_aligned_translates (Grob *me, Real padding = robust_scm2double (me->get_property ("padding"), 0.0); vector translates; + Skyline down_skyline (stacking_dir); for (vsize j = 0; j < elems.size (); j++) { 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]); + { + down_skyline.merge (skylines[j-1][stacking_dir]); + dy = down_skyline.distance (skylines[j][-stacking_dir]); + } - where += stacking_dir * max (0.0, dy + padding + extra_space / elems.size ()); + if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */ + dy = 0.0; + + dy = max (0.0, dy + padding + extra_space / elems.size ()); + down_skyline.raise (-stacking_dir * dy); + where += stacking_dir * dy; translates.push_back (where); } @@ -307,6 +250,25 @@ Align_interface::align_elements_to_extents (Grob *me, Axis a) all_grobs[j]->translate_axis (translates[j], 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 = stretchable_children_count (me); + Real offset = 0.0; + Direction dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); + for (vsize i = 1; i < elts.size (); i++) + { + if (!elts[i]->extent (me, a).is_empty () + && !to_boolean (elts[i]->get_property ("keep-fixed-while-stretching"))) + offset += amount / non_empty_elts; + elts[i]->translate_axis (dir * offset, a); + } + me->flush_extent_cache (Y_AXIS); +} + Real Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end) { @@ -376,42 +338,60 @@ Align_interface::set_ordered (Grob *me) ga->set_ordered (true); } -/* - 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 - piano staff. -*/ -Grob * -find_fixed_alignment_parent (Grob *g) +int +Align_interface::stretchable_children_count (Grob const *me) { - while (g) - { - if (scm_is_number (g->get_property ("forced-distance"))) - return g; + extract_grob_set (me, "elements", elts); + int ret = 0; - g = g->get_parent (Y_AXIS); - } + /* start at 1: we will never move the first child while stretching */ + for (vsize i = 1; i < elts.size (); i++) + if (!to_boolean (elts[i]->get_property ("keep-fixed-while-stretching")) + && !elts[i]->extent (elts[i], Y_AXIS).is_empty ()) + ret++; - return 0; + return ret; +} + +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 && stretchable_children_count (me) > 0) + { + 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); } ADD_INTERFACE (Align_interface, + "Order grobs from top to bottom, left to right, right to left" + " or bottom to top. For vertical alignments of staves, the" + " @code{break-system-details} of the left" + " @rinternals{NonMusicalPaperColumn} may be set to tune" + " vertical spacing. Set @code{alignment-extra-space} to add" + " extra space for staves. Set" + " @code{fixed-alignment-extra-space} to force staves in" + " @code{PianoStaff}s further apart.", - "Order grobs from top to bottom, left to right, right to left or bottom " - "to top. " - "For vertical alignments of staves, the @code{break-system-details} of " - "the left @internalsref{NonMusicalPaperColumn} may be set to tune vertical spacing " - "Set @code{alignment-extra-space} to add extra space for staves. Set " - "@code{fixed-alignment-extra-space} to force staves in PianoStaves further apart." - , - - /* - properties - */ + /* properties */ "align-dir " "axes " "elements " - "forced-distance " "padding " "positioning-done " "stacking-dir "