* The grand 2005-2006 replace.

[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 3e2417f8ebd24da14465aba1f00c0211f666fef1..f8420239eef6eb7d9c59565b3cecee3d82547956 100644 (file)
--- a/lily/hara-kiri-group-spanner.cc
+++ b/lily/hara-kiri-group-spanner.cc
@@ -3,8 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Jan Nieuwenhuizen <janneke@gnu.org>
-  Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "hara-kiri-group-spanner.hh"
@@ -38,7 +38,7 @@ Hara_kiri_group_spanner::consider_suicide (Grob *me)
 
   bool remove_first = to_boolean (me->get_property ("remove-first"));
   if (!remove_first
-       && ((sp->original_ && broken_spanner_index (sp) == 0)
+       && ((sp->original () && broken_spanner_index (sp) == 0)
           || Paper_column::get_rank (sp->get_bound (LEFT)->get_column ())
           == 0)) 
     return;
@@ -81,12 +81,6 @@ Hara_kiri_group_spanner::force_hara_kiri_in_parent_callback (SCM smob, SCM axis)
   return scm_from_double (0.0);
 }
 
-void
-Hara_kiri_group_spanner::add_element (Grob *me, Grob *e)
-{
-  Axis_group_interface::add_element (me, e);
-}
-
 void
 Hara_kiri_group_spanner::add_interesting_item (Grob *me, Grob *n)
 {