X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=2a479458d6c221fe4cceb8ad0bdca8cb24f8aad7;hb=2f38710a2b40a24977441aa7faa05b6ab132f3cf;hp=69fb5e921c3a56f4efd3867493d75fb2cf0b8840;hpb=875b287f353888564d12882449447afcaabf097a;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index 69fb5e921c..2a479458d6 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,83 +3,60 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2007 Han-Wen Nienhuys + (c) 2000--2009 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 "page-layout-problem.hh" +#include "paper-book.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 - scheme of sorts into this: the alignment should default to a certain - distance between element refpoints, unless bbox force a bigger - distance. - */ -MAKE_SCHEME_CALLBACK (Align_interface, calc_positioning_done, 1); +MAKE_SCHEME_CALLBACK (Align_interface, align_to_minimum_distances, 1); SCM -Align_interface::calc_positioning_done (SCM smob) +Align_interface::align_to_minimum_distances (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)); - Align_interface::align_elements_to_extents (me, ax); + Align_interface::align_elements_to_minimum_distances (me, ax); return SCM_BOOL_T; } -/* - 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, align_to_ideal_distances, 1); SCM -Align_interface::stretch_after_break (SCM grob) +Align_interface::align_to_ideal_distances (SCM smob) { - Grob *me = unsmob_grob (grob); + Grob *me = unsmob_grob (smob); - Spanner *me_spanner = dynamic_cast (me); - extract_grob_set (me, "elements", elems); + me->set_property ("positioning-done", SCM_BOOL_T); - if (me_spanner && elems.size ()) - { - Grob *common = common_refpoint_of_array (elems, me, Y_AXIS); - - /* force position callbacks */ - 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 extra_space_handle = scm_assoc (ly_symbol2scm ("fixed-alignment-extra-space"), details); - - Real extra_space = robust_scm2double (scm_is_pair (extra_space_handle) - ? scm_cdr (extra_space_handle) - : SCM_EOL, - 0.0); - - Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), - DOWN); - Real delta = extra_space / elems.size() * stacking_dir; - for (vsize i = 0; i < elems.size (); i++) - elems[i]->translate_axis (i * delta, Y_AXIS); - } - - return SCM_UNSPECIFIED; + Align_interface::align_elements_to_ideal_distances (me); + + return SCM_BOOL_T; } /* 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 */ +// TODO(jneem): the pure and non-pure parts seem to share very little +// code. Split them into 2 functions, perhaps? static void get_skylines (Grob *me, vector *const elements, @@ -87,60 +64,25 @@ 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]; Skyline_pair skylines; - /* 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 ("skylines")); + Skyline_pair *skys = Skyline_pair::unsmob (g->get_property (a == Y_AXIS + ? "vertical-skylines" + : "horizontal-skylines")); if (skys) skylines = *skys; - else - programming_error ("no skylines for alignment-child\n"); - - /* 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)) - { - Box b; - Interval other_extent = g->extent (common_refpoint, other_axis (a)); - b[a] = ly_scm2interval (min_extent); - 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 @@ -151,9 +93,33 @@ get_skylines (Grob *me, { Box b; b[a] = extent; - b[other_axis (a)] = Interval (-infinity_f, infinity_f); + b[other_axis (a)] = Interval (0, infinity_f); skylines.insert (b, 0, other_axis (a)); } + + // This is a hack to get better accuracy on the pure-height of VerticalAlignment. + // It's quite common for a treble clef to be the highest element of one system + // and for a low note (or lyrics) to be the lowest note on another. The two will + // never collide, but the pure-height stuff only works with bounding boxes, so it + // doesn't know that. The result is a significant over-estimation of the pure-height, + // especially on systems with many staves. To correct for this, we build a skyline + // in two parts: the part we did above contains most of the grobs (note-heads, etc.) + // while the bit we're about to do only contains the breakable grobs at the beginning + // of the system. This way, the tall treble clefs are only compared with the treble + // clefs of the other staff and they will be ignored if the staff above is, for example, + // lyrics. + if (Axis_group_interface::has_interface (g) + && !Hara_kiri_group_spanner::request_suicide (g, start, end)) + { + Interval begin_of_line_extent = Axis_group_interface::begin_of_line_pure_height (g, start); + if (!begin_of_line_extent.is_empty ()) + { + Box b; + b[a] = begin_of_line_extent; + b[other_axis (a)] = Interval (-infinity_f, -1); + skylines.insert (b, 0, other_axis (a)); + } + } } if (skylines.is_empty ()) @@ -165,74 +131,88 @@ get_skylines (Grob *me, } vector -Align_interface::get_extents_aligned_translates (Grob *me, - vector const &all_grobs, - Axis a, - bool pure, int start, int end) +Align_interface::get_minimum_translations (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) - { - 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.")); - - } + if (!pure && a == Y_AXIS && dynamic_cast (me) && !me->get_system ()) + me->programming_error ("vertical alignment called before line-breaking"); Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); - vector elems (all_grobs); // writable copy vector skylines; get_skylines (me, &elems, a, pure, start, end, &skylines); + SCM forced_distances = ly_assoc_get (ly_symbol2scm ("alignment-distances"), + Page_layout_problem::get_details (me), + SCM_EOL); + 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) - : SCM_EOL, - 0.0); - - Real padding = robust_scm2double (me->get_property ("padding"), 0.0); + Real default_padding = robust_scm2double (me->get_property ("padding"), 0.0); vector translates; + Skyline down_skyline (stacking_dir); + SCM last_spaceable_element_details = SCM_EOL; + Real last_spaceable_element_pos = 0; + bool found_spaceable_element = false; for (vsize j = 0; j < elems.size (); j++) { Real dy = 0; + Real padding = default_padding; + 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 ()); - translates.push_back (where); - } + if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */ + dy = 0.0; - 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++) + if (Page_layout_problem::is_spaceable (elems[j])) + { + Real min_distance = 0; + Page_layout_problem::read_spacing_spec (last_spaceable_element_details, + &padding, + ly_symbol2scm ("padding")); + if (Page_layout_problem::read_spacing_spec (last_spaceable_element_details, + &min_distance, + ly_symbol2scm ("minimum-distance"))) + dy = max (dy, min_distance + stacking_dir*(last_spaceable_element_pos - where)); + + if (found_spaceable_element && scm_is_pair (forced_distances)) + { + SCM forced_dist = scm_car (forced_distances); + forced_distances = scm_cdr (forced_distances); + + if (scm_is_number (forced_dist)) + dy = scm_to_double (forced_dist) + stacking_dir * (last_spaceable_element_pos - where); + } + last_spaceable_element_details = elems[j]->get_property ("next-staff-padding"); + found_spaceable_element = true; + } + else { - if (scm_is_number (scm_car (s))) - translates[i] = scm_to_double (scm_car (s)); + // TODO: provide support for min-distance and padding for non-spaceable elements also. } + + dy = max (0.0, dy + padding); + down_skyline.raise (-stacking_dir * dy); + where += stacking_dir * dy; + translates.push_back (where); + + if (Page_layout_problem::is_spaceable (elems[j])) + last_spaceable_element_pos = where; } + // So far, we've computed the translates for all the non-empty elements. + // Here, we set the translates for the empty elements: an empty element + // gets the same translation as the last non-empty element before it. vector all_translates; - if (!translates.empty ()) { Real w = translates[0]; @@ -247,33 +227,23 @@ Align_interface::get_extents_aligned_translates (Grob *me, } void -Align_interface::align_elements_to_extents (Grob *me, Axis a) +Align_interface::align_elements_to_ideal_distances (Grob *me) { - extract_grob_set (me, "elements", all_grobs); + System *sys = me->get_system (); + Page_layout_problem layout (NULL, SCM_EOL, scm_list_1 (sys->self_scm ())); - 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); + layout.solution (true); } -/* 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) +Align_interface::align_elements_to_minimum_distances (Grob *me, 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 = 0; i < elts.size (); i++) - { - elts[i]->translate_axis (dir * offset, a); - if (!elts[i]->extent (me, a).is_empty () - && !to_boolean (elts[i]->get_property ("keep-fixed-while-stretching"))) - offset += amount / non_empty_elts; - } - me->flush_extent_cache (Y_AXIS); + extract_grob_set (me, "elements", all_grobs); + + vector translates = get_minimum_translations (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); } Real @@ -297,7 +267,7 @@ Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, in } else { - vector translates = get_extents_aligned_translates (me, all_grobs, Y_AXIS, true, start, end); + vector translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, start, end); if (translates.size ()) { @@ -309,7 +279,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 is no child of mine")); + programming_error ("tried to get a translation for something that is no child of mine"); return 0; } @@ -345,75 +315,17 @@ Align_interface::set_ordered (Grob *me) ga->set_ordered (true); } -int -Align_interface::stretchable_children_count (Grob const *me) -{ - extract_grob_set (me, "elements", elts); - int ret = 0; - - /* 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 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); -} - -/* - 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. - - FIXME: piano staves no longer have forced-distance. The code that - relies on this function (in line-spanner) is broken. -*/ -Grob * -find_fixed_alignment_parent (Grob *g) -{ - (void) g; - programming_error ("deprecated. We don't use forced-distance anymore"); - return 0; -} - 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 "