X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=399823408f88d501a246a97a3ae5cd54fa321ce2;hb=3dd560c0c440c9e97730ca13f6d5abbb020bb02e;hp=407f0265103716af3322e8f7099a6b1f5ff8fad3;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 407f026510..399823408f 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,112 +1,98 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+
+  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "engraver.hh"
-#include "group-interface.hh"
-#include "item.hh"
-#include "musical-request.hh"
+
+#include "pointer-group-interface.hh"
 #include "arpeggio.hh"
 #include "stem.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
+#include "stream-event.hh"
 #include "note-column.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Arpeggio_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Arpeggio_engraver); 
-protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
-
-  virtual void stop_translation_timestep ();
-  virtual bool try_music (Music *);
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
-  Item* arpeggio_; 
-  Arpeggio_req *arpeggio_req_;
+  Item *arpeggio_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::try_music (Music* m)
+IMPLEMENT_TRANSLATOR_LISTENER (Arpeggio_engraver, arpeggio);
+void Arpeggio_engraver::listen_arpeggio (Stream_event *ev)
 {
-  if (!arpeggio_req_)
-    {
-      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
-	{
-	  arpeggio_req_ = a;
-	  return true;
-	}
-    }
-  return false;
+  ASSIGN_EVENT_ONCE (arpeggio_event_, ev);
 }
 
 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_grob_property ("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::process_music ()
 {
-  if (arpeggio_req_)
+  if (arpeggio_event_)
     {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      announce_grob(arpeggio_, arpeggio_req_->self_scm());
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
 }
 
 void
 Arpeggio_engraver::stop_translation_timestep ()
 {
-  if (arpeggio_)
-    {
-      typeset_grob (arpeggio_);
-      arpeggio_ = 0;
-    }
-  arpeggio_req_ = 0;
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
 }
 
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
 
-
-
-ENTER_DESCRIPTION(Arpeggio_engraver,
-/* descr */       "Generate an Arpeggio from a Arpeggio_req",
-/* creats*/       "Arpeggio",
-/* acks  */       "stem-interface rhythmic-head-interface note-column-interface",
-/* reads */       "",
-/* write */       "");
+ADD_TRANSLATOR (Arpeggio_engraver,
+		/* doc */ "Generate an Arpeggio symbol",
+		/* create */ "Arpeggio",
+		/* read */ "",
+		/* write */ "");