X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fhara-kiri-engraver.cc;h=fcf4b8671679e218d3dd760992fb55710c42243a;hb=05f05a51ca0078ce9a8c87cbf30ac7fbd4def706;hp=1d2e281c2125c30d914bbe8f4e08abc6eeea8acf;hpb=ee513a2f7d18fc8d43e1c291350ed81856b0192d;p=lilypond.git

diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc
index 1d2e281c21..fcf4b86716 100644
--- a/lily/hara-kiri-engraver.cc
+++ b/lily/hara-kiri-engraver.cc
@@ -1,30 +1,105 @@
-/*   
-  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"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2005--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#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;
+}
 
-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 */
+                ""
+               );
+