2003 -> 2004

[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 83a4f2706829c8fea73ad7c38954c8d05e8619be..b5071cc8155e3a64429bc6f3a2a6fe6bd70b08f8 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
@@ -30,10 +30,17 @@ Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis)
 void
 Hara_kiri_group_spanner::consider_suicide (Grob*me)
 {
+  Spanner*sp = dynamic_cast<Spanner*> (me);
   SCM worth = me->get_grob_property ("items-worth-living");
   if (gh_pair_p (worth))
     return ;
 
+  if (!to_boolean (me->get_grob_property ("remove-first"))
+      && broken_spanner_index (sp) == 0)
+    {
+      return ;
+    }
+  
   Link_array<Grob> childs = Axis_group_interface::get_children (me);
   for (int i = 0; i < childs.size (); i++)
     childs[i]->suicide ();
@@ -98,5 +105,5 @@ ADD_INTERFACE (Hara_kiri_group_spanner,"hara-kiri-group-interface",
 we don't contain any interesting items after linebreaking, then                        \
 gracefully commit suicide.  Objective: don't disgrace Lily by                  \
 typesetting empty lines in orchestral scores.",                                        \
-  "items-worth-living");
+  "items-worth-living remove-first");