X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Falign-interface.cc;h=cb876f5bbf1de0297f590d7e79c3902a26af3ebe;hb=999b5321b8a9ba9a2b01e792ba710a2f6b710d51;hp=f27316bb278535ff049b3d736bebb9e2effb7025;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git diff --git a/lily/align-interface.cc b/lily/align-interface.cc index f27316bb27..cb876f5bbf 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2000--2010 Han-Wen Nienhuys + Copyright (C) 2000--2011 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 @@ -146,8 +146,39 @@ 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 true, the manually fixed spacings +// induced by stretchable=0 or alignment-distances are included +// in the minimum translations here. If you want to find the minimum +// height of a system, include_fixed_spacing should be true. If you +// want 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"); @@ -165,6 +196,7 @@ Align_interface::get_minimum_translations (Grob *me, Skyline down_skyline (stacking_dir); Real last_spaceable_element_pos = 0; Grob *last_spaceable_element = 0; + int spaceable_count = 0; for (vsize j = 0; j < elems.size (); j++) { Real dy = 0; @@ -177,19 +209,22 @@ Align_interface::get_minimum_translations (Grob *me, 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]); + 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")); Real min_distance = 0; if (Page_layout_problem::read_spacing_spec (spec, &min_distance, ly_symbol2scm ("minimum-distance"))) dy = max (dy, min_distance); + if (include_fixed_spacing) + dy = max (dy, Page_layout_problem::get_fixed_spacing (elems[j-1], elems[j], spaceable_count, pure, start, end)); + if (Page_layout_problem::is_spaceable (elems[j]) && last_spaceable_element) { - // Spaceable staves may have min-distance and padding + // 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]); + 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, @@ -201,6 +236,10 @@ Align_interface::get_minimum_translations (Grob *me, &min_distance, ly_symbol2scm ("minimum-distance"))) dy = max (dy, min_distance + stacking_dir*(last_spaceable_element_pos - where)); + + if (include_fixed_spacing) + dy = max (dy, Page_layout_problem::get_fixed_spacing (last_spaceable_element, elems[j], spaceable_count, + pure, start, end)); } } @@ -214,6 +253,7 @@ Align_interface::get_minimum_translations (Grob *me, if (Page_layout_problem::is_spaceable (elems[j])) { + spaceable_count++; last_spaceable_element = elems[j]; last_spaceable_element_pos = where; } @@ -254,7 +294,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); @@ -264,34 +304,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;