Fix 1442.

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 2385b035fdb058eb3e7c228712c4f3adac586c43..bfda43ed43e366a55a95f42206f4f3293cb08816 100644 (file)
--- 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 <hanwen@xs4all.nl>
+  Copyright (C) 2000--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   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,11 +146,50 @@ get_skylines (Grob *me,
 vector<Real>
 Align_interface::get_minimum_translations (Grob *me,
                                           vector<Grob*> 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<Real>
+Align_interface::get_pure_minimum_translations (Grob *me,
+                                               vector<Grob*> const &all_grobs,
+                                               Axis a, int start, int end)
+{
+  return internal_get_minimum_translations (me, all_grobs, a, true, true, start, end);
+}
+
+vector<Real>
+Align_interface::get_minimum_translations_without_min_dist (Grob *me,
+                                                           vector<Grob*> 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).  That is, all
+// minimum-distances, line-break-system-details, basic-distance+stretchable=0
+// constraints will be ignored.
+// - 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<Real>
+Align_interface::internal_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 ())
     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<System*> (me->get_parent (Y_AXIS)))
+    include_fixed_spacing = false;
   
   Direction stacking_dir = robust_scm2dir (me->get_property ("stacking-dir"),
                                           DOWN);
@@ -165,6 +204,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;
@@ -180,13 +220,18 @@ Align_interface::get_minimum_translations (Grob *me,
          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)
+           {
+             Real min_distance = 0;
+             if (Page_layout_problem::read_spacing_spec (spec, &min_distance, ly_symbol2scm ("minimum-distance")))
+               dy = max (dy, min_distance);
+
+             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);
@@ -196,11 +241,17 @@ Align_interface::get_minimum_translations (Grob *me,
                                                      ly_symbol2scm ("padding"));
              padding = max (padding, spaceable_padding);
 
-             Real min_distance = 0;
-             if (Page_layout_problem::read_spacing_spec (spec,
-                                                         &min_distance,
-                                                         ly_symbol2scm ("minimum-distance")))
-               dy = max (dy, min_distance + stacking_dir*(last_spaceable_element_pos - where));
+             if (include_fixed_spacing)
+               {
+                 Real min_distance = 0;
+                 if (Page_layout_problem::read_spacing_spec (spec,
+                                                             &min_distance,
+                                                             ly_symbol2scm ("minimum-distance")))
+                   dy = max (dy, 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));
+               }
            }
        }
 
@@ -214,6 +265,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 +306,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);
   if (translates.size ())
     for (vsize j = 0; j < all_grobs.size (); j++)
       all_grobs[j]->translate_axis (translates[j], a);
@@ -264,7 +316,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_pure_minimum_translations (me, all_grobs, Y_AXIS, start, end);
 
   if (translates.size ())
     {