Fix 442.

[lilypond.git] / lily / hara-kiri-group-spanner.cc

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 395bcdb553931e0db85b9b0ca7266318e5d09b0a..8f007197cd2bb7f3d10ddfff2a2f2318f4e4604f 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -76,6 +76,20 @@ bool find_in_range (SCM vector, int low, int hi, int min, int max)
 
 bool
 Hara_kiri_group_spanner::request_suicide (Grob *me, int start, int end)
+{
+  if (!request_suicide_alone (me, start, end))
+    return false;
+
+  extract_grob_set (me, "keep-alive-with", friends);
+  for (vsize i = 0; i < friends.size (); ++i)
+    if (friends[i]->is_live () && !request_suicide_alone (friends[i], start, end))
+      return false;
+
+  return true;
+}
+
+bool
+Hara_kiri_group_spanner::request_suicide_alone (Grob *me, int start, int end)
 {
   if (!to_boolean (me->get_property ("remove-empty")))
     return false;
@@ -172,6 +186,7 @@ ADD_INTERFACE (Hara_kiri_group_spanner,
               /* properties */
               "items-worth-living "
               "important-column-ranks "
+              "keep-alive-with "
               "remove-empty "
               "remove-first "
               );