Fix 1240.

[lilypond.git] / lily / align-interface.cc

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 2385b035fdb058eb3e7c228712c4f3adac586c43..d985a869c51673bc15329bf1d4e0428fc26a820b 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -143,10 +143,17 @@ get_skylines (Grob *me,
   reverse (*ret);
 }
 
+// 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<Real>
 Align_interface::get_minimum_translations (Grob *me,
                                           vector<Grob*> const &all_grobs,
                                           Axis a,
+                                          bool include_fixed_spacing,
                                           bool pure, int start, int end)
 {
   if (!pure && a == Y_AXIS && dynamic_cast<Spanner*> (me) && !me->get_system ())
@@ -165,6 +172,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;
@@ -184,9 +192,12 @@ Align_interface::get_minimum_translations (Grob *me,
          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], pure, start, end);
@@ -201,6 +212,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 +229,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 +270,7 @@ Align_interface::align_elements_to_minimum_distances (Grob *me, Axis a)
 {
   extract_grob_set (me, "elements", all_grobs);
 
-  vector<Real> translates = get_minimum_translations (me, all_grobs, a, false, 0, 0);
+  vector<Real> translates = get_minimum_translations (me, all_grobs, a, true, false, 0, 0);
   if (translates.size ())
     for (vsize j = 0; j < all_grobs.size (); j++)
       all_grobs[j]->translate_axis (translates[j], a);
@@ -264,7 +280,7 @@ Real
 Align_interface::get_pure_child_y_translation (Grob *me, Grob *ch, int start, int end)
 {
   extract_grob_set (me, "elements", all_grobs);
-  vector<Real> translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, start, end);
+  vector<Real> translates = get_minimum_translations (me, all_grobs, Y_AXIS, true, true, start, end);
 
   if (translates.size ())
     {