Doc-de: update macros.itely and nitpicks

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

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index d69930c3aa5ec715ab7bf2a42020506c966fab4b..36aa81f11153d428eb9adafcfd7f2206766b51b4 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -154,7 +154,8 @@ get_skylines (Grob *me,
          // of the system. This way, the tall treble clefs are only compared with the treble
          // clefs of the other staff and they will be ignored if the staff above is, for example,
          // lyrics.
-         if (Axis_group_interface::has_interface (g))
+         if (Axis_group_interface::has_interface (g)
+             && !Hara_kiri_group_spanner::request_suicide (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 ())
@@ -249,8 +250,10 @@ Align_interface::get_extents_aligned_translates (Grob *me,
        }
     }
 
+  // So far, we've computed the translates for all the non-empty elements.
+  // Here, we set the translates for the empty elements: an empty element
+  // gets the same translation as the last non-empty element before it.
   vector<Real> all_translates;
-
   if (!translates.empty ())
     {
       Real w = translates[0];