From: hanwen <hanwen>
Date: Tue, 11 Oct 2005 06:22:47 +0000 (+0000)
Subject: (consider_suicide): only
X-Git-Tag: release/2.7.16^2~96
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5233ae78aac680e47acf2c02472f1944a36561fa;p=lilypond.git

(consider_suicide): only
consider break index for broken spanner.
---

diff --git a/ChangeLog b/ChangeLog
index b710c225d5..bbb56f585b 100644
--- 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 28043337ff..f824a2a8cb 100644
--- 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;