X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=fd28a41e1fc4ce36a726a273e78e444572495baf;hb=dacf1d3839929e0e89b7df14bebc46f4ddb6d6e1;hp=856b5a7303899c61a934af799fca2f4eeea3ae78;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 856b5a7303..fd28a41e1f 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
@@ -22,10 +22,12 @@ class Arpeggio_engraver : public Engraver
 public:
   TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
 protected:
-  virtual void acknowledge_grob (Grob_info);
-  PRECOMPUTED_VIRTUAL void process_music ();
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
   virtual bool try_music (Music *);
 private:
   Item *arpeggio_;
@@ -42,49 +44,47 @@ bool
 Arpeggio_engraver::try_music (Music *m)
 {
   if (!arpeggio_event_)
-    {
-      arpeggio_event_ = m;
-    }
+    arpeggio_event_ = m;
   return true;
 }
 
 void
-Arpeggio_engraver::acknowledge_grob (Grob_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
 {
   if (arpeggio_)
     {
-      if (Stem::has_interface (info.grob ()))
-	{
-	  if (!arpeggio_->get_parent (Y_AXIS))
-	    arpeggio_->set_parent (info.grob (), Y_AXIS);
-
-	  Pointer_group_interface::add_grob (arpeggio_,
-					     ly_symbol2scm ("stems"),
-					     info.grob ());
-	}
-
-      /*
-	We can't catch local key items (accidentals) from Voice context,
-	see Local_key_engraver
-      */
-      else if (Rhythmic_head::has_interface (info.grob ()))
-	{
-	  Side_position_interface::add_support (arpeggio_, info.grob ());
-	}
-      else if (Note_column::has_interface (info.grob ()))
-	{
-	  info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
-	}
+      if (!arpeggio_->get_parent (Y_AXIS))
+	arpeggio_->set_parent (info.grob (), Y_AXIS);
+
+      Pointer_group_interface::add_grob (arpeggio_,
+					 ly_symbol2scm ("stems"),
+					 info.grob ());
     }
 }
+void
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
+{
+  if (arpeggio_)
+
+    /*
+      We can't catch local key items (accidentals) from Voice context,
+      see Local_key_engraver
+    */
+    Side_position_interface::add_support (arpeggio_, info.grob ());
+}
+
+void
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
+{
+  if (arpeggio_)
+    info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
+}
 
 void
 Arpeggio_engraver::process_music ()
 {
   if (arpeggio_event_)
-    {
-      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
-    }
+    arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
 }
 
 void
@@ -94,10 +94,13 @@ Arpeggio_engraver::stop_translation_timestep ()
   arpeggio_event_ = 0;
 }
 
-ADD_TRANSLATOR (Arpeggio_engraver,
-		/* descr */ "Generate an Arpeggio symbol",
-		/* creats*/ "Arpeggio",
-		/* accepts */ "arpeggio-event",
-		/* acks  */ "stem-interface rhythmic-head-interface note-column-interface",
-		/* reads */ "",
-		/* write */ "");
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column)
+
+  ADD_TRANSLATOR (Arpeggio_engraver,
+		  /* doc */ "Generate an Arpeggio symbol",
+		  /* create */ "Arpeggio",
+		  /* accept */ "arpeggio-event",
+		  /* read */ "",
+		  /* write */ "");