rename feta-alphabet to feta-alphabet-generic

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index aee6dad7058411b187c9b7388cca059e3d92aec1..266016d5734b4e2ce764129547c140ac6d45e5f4 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -212,9 +212,17 @@ Align_interface::internal_get_minimum_translations (Grob *me,
       Skyline_pair skyline = get_skylines (elems[j], a, other_common, pure, start, end);
 
       if (skyline.is_empty ())
-        dy = 0.0;
-      else if (!last_nonempty_element)
-        dy = skyline[-stacking_dir].max_height () + padding;
+        {
+          translates.push_back (where);
+          continue;
+        }
+
+      if (!last_nonempty_element)
+        {
+          dy = skyline[-stacking_dir].max_height () + padding;
+          for (vsize k = j; k-- > 0;)
+            translates[k] = stacking_dir * dy;
+        }
       else
         {
           SCM spec = Page_layout_problem::get_spacing_spec (last_nonempty_element, elems[j], pure, start, end);
@@ -267,8 +275,7 @@ Align_interface::internal_get_minimum_translations (Grob *me,
           last_spaceable_element_pos = where;
           last_spaceable_skyline = down_skyline;
         }
-      if (!skyline.is_empty ())
-        last_nonempty_element = elems[j];
+      last_nonempty_element = elems[j];
     }
 
   if (pure)