Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index d77b642726bc0dbe3477a18e64e2ade0b7110521..3d68bce912115b9bf16baba295895b428e8d6002 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -89,13 +89,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 +104,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 +114,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 ())
@@ -154,9 +156,8 @@ Align_interface::get_minimum_translations (Grob *me,
   Real default_padding = robust_scm2double (me->get_property ("padding"), 0.0);
   vector<Real> 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;
   for (vsize j = 0; j < elems.size (); j++)
     {
       Real dy = 0;
@@ -168,45 +169,56 @@ Align_interface::get_minimum_translations (Grob *me,
        {
          down_skyline.merge (skylines[j-1][stacking_dir]);
          dy = down_skyline.distance (skylines[j][-stacking_dir]);
-       }
 
-      if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */
-       dy = 0.0;
+         SCM spec = Page_layout_problem::get_spacing_spec (elems[j-1], elems[j]);
+         Page_layout_problem::read_spacing_spec (spec, &padding, ly_symbol2scm ("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))
+         if (Page_layout_problem::read_spacing_spec (spec, &min_distance, ly_symbol2scm ("minimum-distance")))
+           dy = max (dy, min_distance);
+
+         if (Page_layout_problem::is_spaceable (elems[j]) && last_spaceable_element)
            {
-             SCM forced_dist = scm_car (forced_distances);
-             forced_distances = scm_cdr (forced_distances);
+             // Spaceable staves may have min-distance and padding
+             // 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]);
+             Real spaceable_padding = 0;
+             Page_layout_problem::read_spacing_spec (spec,
+                                                     &spaceable_padding,
+                                                     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 (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);
+                 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-spacing");
-         found_spaceable_element = true;
-       }
-      else
-       {
-         // TODO: provide support for min-distance and padding for non-spaceable elements also.
        }
 
+      if (isinf (dy)) /* if the skyline is empty, maybe max_height is infinity_f */
+       dy = 0.0;
+
       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;
+       {
+         last_spaceable_element = elems[j];
+         last_spaceable_element_pos = where;
+       }
     }
 
   // So far, we've computed the translates for all the non-empty elements.
@@ -332,5 +344,4 @@ ADD_INTERFACE (Align_interface,
               "padding "
               "positioning-done "
               "stacking-dir "
-              "threshold "
               );