* The grand 2005-2006 replace.

[lilypond.git] / lily / hara-kiri-engraver.cc

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 7bc84f870a65418bf87b36efc2a9f6f20cd71400..48139aeb94d04e5404a80b097884601951056c22 100644 (file)
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -3,8 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
@@ -14,19 +13,29 @@
 
 #include "translator.icc"
 
+/*
+  TODO: fold together with axis_group_engraver? 
+ */
+
 class Hara_kiri_engraver : public Axis_group_engraver
 {
 protected:
   virtual Spanner *get_spanner ();
-  DECLARE_ACKNOWLEDGER(grob);
+  DECLARE_ACKNOWLEDGER (grob);
   virtual void add_element (Grob *e);
   void start_translation_timestep ();
-
+  virtual void derived_mark () const;
   SCM interesting_;
 public:
   TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
 };
 
+void
+Hara_kiri_engraver::derived_mark () const
+{
+  scm_gc_mark (interesting_);
+}
+
 void
 Hara_kiri_engraver::start_translation_timestep ()
 {
@@ -34,18 +43,16 @@ Hara_kiri_engraver::start_translation_timestep ()
   interesting_ = get_property ("keepAliveInterfaces");
 }
 
-
 void
 Hara_kiri_engraver::add_element (Grob *e)
 {
-  Hara_kiri_group_spanner::add_element (staffline_, e);
+  Axis_group_engraver::add_element (e);
 }
 
 Spanner *
 Hara_kiri_engraver::get_spanner ()
 {
-  Spanner *sp = make_spanner ("RemoveEmptyVerticalGroup", SCM_EOL);
-
+  Spanner *sp = make_spanner ("VerticalAxisGroup", SCM_EOL);
   return sp;
 }
 
@@ -68,13 +75,12 @@ Hara_kiri_engraver::Hara_kiri_engraver ()
   interesting_ = SCM_EOL;
 }
 
-
-ADD_ACKNOWLEDGER(Hara_kiri_engraver, grob);
+ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
 ADD_TRANSLATOR (Hara_kiri_engraver,
-               /* descr */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
+               /* doc */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
                "interesting items (ie. note heads, lyric syllables and normal rests) ",
-               /* creats*/ "RemoveEmptyVerticalGroup",
-               /* accepts */ "",
-               /* reads */ "keepAliveInterfaces",
+               /* create */ "VerticalAxisGroup",
+               /* accept */ "",
+               /* read */ "keepAliveInterfaces",
                /* write */ "");