X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-engraver.cc;h=79fbd11f9d74f3d8442a6b043c7a1f5ffeed235f;hb=918ed854dd4893789234f1a2e7854f13c0f04070;hp=29211b6234afa56d09faaf3e04de38299eb24b21;hpb=76f13ab50fc726c89fa7c96f3deed519d2d773dc;p=lilypond.git

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 29211b6234..79fbd11f9d 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -1,30 +1,87 @@
-/*   
+/*
   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>
-  
- */
-#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;
+}
+
+void
+Hara_kiri_engraver::derived_mark () const
+{
+  scm_gc_mark (interesting_);
+}
+
+void
+Hara_kiri_engraver::process_music ()
+{
+  Axis_group_engraver::process_music ();
+  interesting_ = get_property ("keepAliveInterfaces");
+}
 
-Spanner*
-Hara_kiri_engraver::get_spanner_p () const
+void
+Hara_kiri_engraver::add_element (Grob *e)
+{
+  Axis_group_engraver::add_element (e);
+}
+
+Spanner *
+Hara_kiri_engraver::get_spanner ()
 {
-  return new Hara_kiri_group_spanner (SCM_EOL);
+  Spanner *sp = make_spanner ("VerticalAxisGroup", SCM_EOL);
+  return sp;
 }
 
 void
-Hara_kiri_engraver::acknowledge_element (Score_element_info i)
+Hara_kiri_engraver::acknowledge_grob (Grob_info i)
 {
-  Axis_group_engraver::acknowledge_element (i);
-  if (Rhythmic_head *h = dynamic_cast<Rhythmic_head *> (i.elem_l_))
+  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 Axis_group_engraver, but make a hara-kiri spanner, and add "
+		"interesting items (ie. note heads, lyric syllables and normal rests) ",
+		/* create */ "VerticalAxisGroup",
+		/* read */ "keepAliveInterfaces",
+		/* write */ "");
+