Merge branch 'master' of git://git.sv.gnu.org/lilypond

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index 4d885b7a38de0896773058fb10582b137315e13d..db71c32b8f2baa8f5adf9d858e5f747efed11552 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -221,6 +221,9 @@ Align_interface::get_extents_aligned_translates (Grob *me,
          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;
+
       dy = max (0.0, dy + padding + extra_space / elems.size ());
       down_skyline.raise (-stacking_dir * dy);
       where += stacking_dir * dy;