(consider_suicide): backport:

only consider break_index for broken spanner.

diff --git a/ChangeLog b/ChangeLog
index 358885b6edb7318c9d47299ec553c752a079979b..d4b8f5aacbd15f72936a49c15f28b9616b119eb5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/hara-kiri-group-spanner.cc (consider_suicide): backport:
+       only consider break_index for broken spanner.  
+
 2005-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * stepmake/stepmake/python-module-rules.make

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 22975589cbe2df8aad1482ac6f0da63da81c4b1e..909cff6a6dd6cf739ea6e7dd11aa896dae733c4c 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -13,6 +13,7 @@
 #include "spanner.hh"
 #include "warn.hh"
 #include "item.hh"
+#include "paper-column.hh"
 
 MAKE_SCHEME_CALLBACK (Hara_kiri_group_spanner, y_extent, 2);
 SCM
@@ -34,11 +35,13 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me)
   if (scm_is_pair (worth))
     return;
 
-  if (!to_boolean (me->get_property ("remove-first"))
-      && broken_spanner_index (sp) == 0)
-    {
-      return;
-    }
+
+  bool remove_first = to_boolean (me->get_property ("remove-first"));
+  if (!remove_first
+       && ((sp->original_ && broken_spanner_index (sp) == 0)
+          || Paper_column::get_rank (sp->get_bound (LEFT)->get_column ())
+          == 0)) 
+    return;
 
   Link_array<Grob> childs = Axis_group_interface::get_children (me);
   for (int i = 0; i < childs.size (); i++)