(consider_suicide): only

consider break index for broken spanner.

diff --git a/ChangeLog b/ChangeLog
index b710c225d58b5a6da9297e0fd29442c6c41770d7..bbb56f585bb70f0ac9671cecf80885653871af4c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-10-11  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/hara-kiri-group-spanner.cc (consider_suicide): only
+       consider break index for broken spanner.
+
        * scm/define-markup-commands.scm (wordwrap-string): remove \r
        characters from string before splitting.
 

diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc
index 28043337ff6e5b79665b1946144f703eeeea4069..f824a2a8cba77b33071686a7b5ce82eeb45a3226 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -9,6 +9,7 @@
 
 #include "hara-kiri-group-spanner.hh"
 
+#include "paper-column.hh"
 #include "pointer-group-interface.hh"
 #include "axis-group-interface.hh"
 #include "spanner.hh"
@@ -36,8 +37,11 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me)
   if (worth.size ())
     return;
 
-  if (!to_boolean (me->get_property ("remove-first"))
-      && broken_spanner_index (sp) == 0)
+  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;