X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-engraver.cc;h=ea0356526d633ef73cfc7852efa563ab66a11d0b;hb=207c3df3b77d5ec25d7db3bbc6ba830d12ee9f85;hp=1ef2d1ac3c8c2c7a32a69911f0182f7334595d4c;hpb=a8651b61fa25aee299bbc846d180a942568d6075;p=lilypond.git

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 1ef2d1ac3c..ea0356526d 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -1,34 +1,86 @@
-/*   
+/*
   hara-kiri-engraver.cc --  implement Hara_kiri_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "axis-group-engraver.hh"
 #include "hara-kiri-group-spanner.hh"
-#include "hara-kiri-engraver.hh"
 #include "rhythmic-head.hh"
 #include "spanner.hh"
 
-Spanner*
-Hara_kiri_engraver::get_spanner_p () const
+#include "translator.icc"
+
+/*
+  TODO: fold together with axis_group_engraver? 
+ */
+
+class Hara_kiri_engraver : public Axis_group_engraver
 {
-  Spanner * sp = new Spanner (get_property ("basicHaraKiriVerticalGroupspannerProperties"));
-  Hara_kiri_group_spanner::set_interface (sp);
-  return sp;
+protected:
+  virtual Spanner *get_spanner ();
+  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::acknowledge_element (Score_element_info i)
+Hara_kiri_engraver::start_translation_timestep ()
 {
-  Axis_group_engraver::acknowledge_element (i);
+  Axis_group_engraver::start_translation_timestep ();
+  interesting_ = get_property ("keepAliveInterfaces");
+}
 
-  i.elem_l_->add_offset_callback (Hara_kiri_group_spanner::force_hara_kiri_callback, Y_AXIS);
-  
-  if (Rhythmic_head *h = dynamic_cast<Rhythmic_head *> (i.elem_l_))
+void
+Hara_kiri_engraver::add_element (Grob *e)
+{
+  Axis_group_engraver::add_element (e);
+}
+
+Spanner *
+Hara_kiri_engraver::get_spanner ()
+{
+  Spanner *sp = make_spanner ("VerticalAxisGroup", SCM_EOL);
+  return sp;
+}
+
+void
+Hara_kiri_engraver::acknowledge_grob (Grob_info i)
+{
+  Axis_group_engraver::acknowledge_grob (i);
+  if (staffline_)
     {
-      Hara_kiri_group_spanner::add_interesting_item (staffline_p_, h);
+      for (SCM s = interesting_; scm_is_pair (s); s = scm_cdr (s))
+	{
+	  if (i.grob ()->internal_has_interface (scm_car (s)))
+	    Hara_kiri_group_spanner::add_interesting_item (staffline_, i.grob ());
+	}
     }
 }
-ADD_THIS_TRANSLATOR(Hara_kiri_engraver);
+
+Hara_kiri_engraver::Hara_kiri_engraver ()
+{
+  interesting_ = SCM_EOL;
+}
+
+ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
+ADD_TRANSLATOR (Hara_kiri_engraver,
+		/* doc */ "Like Axis_group_engraver, but make a hara-kiri spanner, and add "
+		"interesting items (ie. note heads, lyric syllables and normal rests) ",
+		/* create */ "VerticalAxisGroup",
+		/* accept */ "",
+		/* read */ "keepAliveInterfaces",
+		/* write */ "");
+