X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-engraver.cc;h=d9aa0ddfec7d565d6abcc9ebb09b8c0708bc59e8;hb=e34621159931fdbc7dff10973c2bc9ca38ab024c;hp=0761b36ce3c412c7312437894e7c1390fea5e1c7;hpb=194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f;p=lilypond.git

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 0761b36ce3..d9aa0ddfec 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -1,30 +1,96 @@
-/*   
+/*
   hara-kiri-engraver.cc --  implement Hara_kiri_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-#include "hara-kiri-vertical-group-spanner.hh"
-#include "hara-kiri-engraver.hh"
+
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "axis-group-engraver.hh"
+#include "hara-kiri-group-spanner.hh"
 #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);
+  virtual void add_element (Grob *e);
+  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;
+}
 
-Axis_group_spanner*
-Hara_kiri_engraver::get_spanner_p () const
+void
+Hara_kiri_engraver::derived_mark () const
 {
-  return new Hara_kiri_group_spanner;
+  scm_gc_mark (interesting_);
 }
 
 void
-Hara_kiri_engraver::acknowledge_element (Score_element_info i)
+Hara_kiri_engraver::process_music ()
 {
-  Axis_group_engraver::acknowledge_element (i);
-  if (Rhythmic_head *h = dynamic_cast<Rhythmic_head *> (i.elem_l_))
+  Axis_group_engraver::process_music ();
+  interesting_ = get_property ("keepAliveInterfaces");
+}
+
+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_)
     {
-      dynamic_cast<Hara_kiri_group_spanner*> (staffline_p_)
-	->add_interesting_item (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);
+
+
+ADD_ACKNOWLEDGER (Hara_kiri_engraver, grob);
+ADD_TRANSLATOR (Hara_kiri_engraver,
+		/* 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 */
+		""
+		);
+