Run `make grand-replace'.

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

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index e73c67ab4b494edd3e9723088d26fbab46b6a9a6..e911db54d94985e94fb677c7b44ff385b5ea47c8 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "axis-group-engraver.hh"
@@ -12,38 +11,54 @@
 #include "rhythmic-head.hh"
 #include "spanner.hh"
 
+#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);
-  PRECOMPUTED_VIRTUAL void start_translation_timestep ();
-
+  void process_music ();
+  virtual void derived_mark () const;
   SCM interesting_;
 public:
   TRANSLATOR_DECLARATIONS (Hara_kiri_engraver);
 };
 
+
+Hara_kiri_engraver::Hara_kiri_engraver ()
+{
+  interesting_ = SCM_EOL;
+}
+
 void
-Hara_kiri_engraver::start_translation_timestep ()
+Hara_kiri_engraver::derived_mark () const
 {
-  Axis_group_engraver::start_translation_timestep ();
-  interesting_ = get_property ("keepAliveInterfaces");
+  scm_gc_mark (interesting_);
 }
 
+void
+Hara_kiri_engraver::process_music ()
+{
+  Axis_group_engraver::process_music ();
+  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;
 }
 
@@ -61,19 +76,21 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i)
     }
 }
 
-Hara_kiri_engraver::Hara_kiri_engraver ()
-{
-  interesting_ = SCM_EOL;
-}
 
-#include "translator.icc"
-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 "
-               "interesting items (ie. note heads, lyric syllables and normal rests) ",
-               /* creats*/ "RemoveEmptyVerticalGroup",
-               /* accepts */ "",
-               /* acks  */ "grob-interface",
-               /* reads */ "keepAliveInterfaces",
-               /* write */ "");
+               /* doc */
+               "Like @code{Axis_group_engraver}, but make a hara-kiri"
+               " spanner, and add interesting items (i.e., note heads, lyric"
+               " syllables, and normal rests).",
+
+               /* create */
+               "VerticalAxisGroup ",
+
+               /* read */
+               "keepAliveInterfaces ",
+
+               /* write */
+               ""
+               );