X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=cf957449ec784ecff5f384376c48b930e35fd7cb;hb=4a03918c90866800b208ad12ffc019f577c8ab83;hp=d77b642726bc0dbe3477a18e64e2ade0b7110521;hpb=5aa64a57ecc6c9ceb236116bcd16cc5a829fdd02;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index d77b642726..cf957449ec 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -1,9 +1,20 @@ /* - align-interface.cc -- implement Align_interface + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2000--2011 Han-Wen Nienhuys - (c) 2000--2009 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "align-interface.hh" @@ -89,13 +100,6 @@ get_skylines (Grob *me, { 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 (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 @@ -111,6 +115,7 @@ get_skylines (Grob *me, if (Axis_group_interface::has_interface (g) && !Hara_kiri_group_spanner::request_suicide (g, start, end)) { + extent = Axis_group_interface::rest_of_line_pure_height (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 ()) { @@ -120,6 +125,14 @@ get_skylines (Grob *me, skylines.insert (b, 0, other_axis (a)); } } + + if (!extent.is_empty ()) + { + Box b; + b[a] = extent; + b[other_axis (a)] = Interval (0, infinity_f); + skylines.insert (b, 0, other_axis (a)); + } } if (skylines.is_empty ()) @@ -133,11 +146,52 @@ get_skylines (Grob *me, vector Align_interface::get_minimum_translations (Grob *me, vector const &all_grobs, - Axis a, - bool pure, int start, int end) + Axis a) +{ + return internal_get_minimum_translations (me, all_grobs, a, true, false, 0, 0); +} + +vector +Align_interface::get_pure_minimum_translations (Grob *me, + vector const &all_grobs, + Axis a, int start, int end) +{ + return internal_get_minimum_translations (me, all_grobs, a, true, true, start, end); +} + +vector +Align_interface::get_minimum_translations_without_min_dist (Grob *me, + vector const &all_grobs, + Axis a) +{ + return internal_get_minimum_translations (me, all_grobs, a, false, false, 0, 0); +} + +// If include_fixed_spacing is false, the only constraints that will be measured +// here are those that result from collisions (+ padding) and minimum-distance +// between adjacent staves. +// If include_fixed_spacing is true, constraints from line-break-system-details, +// basic-distance+stretchable=0, and staff-staff-spacing of spaceable staves +// with loose lines in between, are included as well. +// - If you want to find the minimum height of a system, include_fixed_spacing should be true. +// - If you're going to actually lay out the page, then it should be false (or +// else centered dynamics will break when there is a fixed alignment). +vector +Align_interface::internal_get_minimum_translations (Grob *me, + vector const &all_grobs, + Axis a, + bool include_fixed_spacing, + bool pure, int start, int end) { if (!pure && a == Y_AXIS && dynamic_cast (me) && !me->get_system ()) me->programming_error ("vertical alignment called before line-breaking"); + + // If include_fixed_spacing is true, we look at things like system-system-spacing + // and alignment-distances, which only make sense for the toplevel VerticalAlignment. + // If we aren't toplevel, we're working on something like BassFigureAlignment + // and so we definitely don't want to include alignment-distances! + if (!dynamic_cast (me->get_parent (Y_AXIS))) + include_fixed_spacing = false; Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"), DOWN); @@ -146,67 +200,72 @@ Align_interface::get_minimum_translations (Grob *me, 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; 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; + Grob *last_spaceable_element = 0; + Skyline last_spaceable_skyline (stacking_dir); + int spaceable_count = 0; 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 (); + dy = skylines[j][-stacking_dir].max_height () + padding; else { - down_skyline.merge (skylines[j-1][stacking_dir]); - dy = down_skyline.distance (skylines[j][-stacking_dir]); - } + SCM spec = Page_layout_problem::get_spacing_spec (elems[j-1], elems[j], pure, start, end); + Page_layout_problem::read_spacing_spec (spec, &padding, ly_symbol2scm ("padding")); - if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */ - dy = 0.0; + dy = down_skyline.distance (skylines[j][-stacking_dir]) + padding; - 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 (Page_layout_problem::read_spacing_spec (spec, &min_distance, ly_symbol2scm ("minimum-distance"))) + dy = max (dy, min_distance); - if (scm_is_number (forced_dist)) - dy = scm_to_double (forced_dist) + stacking_dir * (last_spaceable_element_pos - where); + if (include_fixed_spacing && Page_layout_problem::is_spaceable (elems[j]) && last_spaceable_element) + { + // Spaceable staves may have + // constraints coming from the previous spaceable staff + // as well as from the previous staff. + spec = Page_layout_problem::get_spacing_spec (last_spaceable_element, elems[j], pure, start, end); + Real spaceable_padding = 0; + Page_layout_problem::read_spacing_spec (spec, + &spaceable_padding, + ly_symbol2scm ("padding")); + dy = max(dy, (last_spaceable_skyline.distance (skylines[j][-stacking_dir]) + + stacking_dir*(last_spaceable_element_pos - where) + spaceable_padding)); + + Real spaceable_min_distance = 0; + if (Page_layout_problem::read_spacing_spec (spec, + &spaceable_min_distance, + ly_symbol2scm ("minimum-distance"))) + dy = max (dy, spaceable_min_distance + stacking_dir*(last_spaceable_element_pos - where)); + + dy = max (dy, Page_layout_problem::get_fixed_spacing (last_spaceable_element, elems[j], spaceable_count, + pure, start, end)); } - last_spaceable_element_details = elems[j]->get_property ("next-staff-spacing"); - found_spaceable_element = true; - } - else - { - // TODO: provide support for min-distance and padding for non-spaceable elements also. } - dy = max (0.0, dy + padding); + if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */ + dy = 0.0; + + dy = max (0.0, dy); down_skyline.raise (-stacking_dir * dy); + down_skyline.merge (skylines[j][stacking_dir]); where += stacking_dir * dy; translates.push_back (where); if (Page_layout_problem::is_spaceable (elems[j])) - last_spaceable_element_pos = where; + { + spaceable_count++; + last_spaceable_element = elems[j]; + last_spaceable_element_pos = where; + last_spaceable_skyline = down_skyline; + } } // So far, we've computed the translates for all the non-empty elements. @@ -230,9 +289,13 @@ void Align_interface::align_elements_to_ideal_distances (Grob *me) { System *sys = me->get_system (); - Page_layout_problem layout (NULL, SCM_EOL, scm_list_1 (sys->self_scm ())); - - layout.solution (true); + if (sys) + { + Page_layout_problem layout (NULL, SCM_EOL, scm_list_1 (sys->self_scm ()), 0); + layout.solution (true); + } + else + programming_error ("vertical alignment called before line breaking"); } void @@ -240,7 +303,7 @@ Align_interface::align_elements_to_minimum_distances (Grob *me, Axis a) { extract_grob_set (me, "elements", all_grobs); - vector translates = get_minimum_translations (me, all_grobs, a, false, 0, 0); + vector translates = get_minimum_translations (me, all_grobs, a); if (translates.size ()) for (vsize j = 0; j < all_grobs.size (); j++) all_grobs[j]->translate_axis (translates[j], a); @@ -250,34 +313,16 @@ 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"); + vector translates = get_pure_minimum_translations (me, all_grobs, Y_AXIS, start, end); - if (scm_is_number (dy_scm)) + if (translates.size ()) { - 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; - } + if (all_grobs[i] == ch) + return translates[i]; } else - { - vector translates = get_minimum_translations (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; - } + return 0; programming_error ("tried to get a translation for something that is no child of mine"); return 0; @@ -320,10 +365,7 @@ ADD_INTERFACE (Align_interface, " 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.", + " vertical spacing.", /* properties */ "align-dir " @@ -332,5 +374,4 @@ ADD_INTERFACE (Align_interface, "padding " "positioning-done " "stacking-dir " - "threshold " );