X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=08682dd674cace34696059191bd66f56422a64a8;hb=16daefb5104997473ab77fd00faf00f34c6baa7e;hp=aa83cb68dcb7a854e5fc699457fa7252d9b2c866;hpb=df4a7c4a55148e065d878dcc2f7e09ac27ea9c32;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index aa83cb68dc..08682dd674 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,39 +1,32 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+
+  (c) 2000--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "engraver.hh"
 #include "group-interface.hh"
-#include "item.hh"
-#include "musical-request.hh"
 #include "arpeggio.hh"
 #include "stem.hh"
-#include "local-key-item.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
-#include "staff-symbol-referencer.hh"
+#include "note-column.hh"
 
 class Arpeggio_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Arpeggio_engraver ();
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
 protected:
   virtual void acknowledge_grob (Grob_info);
-  virtual void create_grobs ();
+  virtual void process_music ();
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
-
 private:
-  Item* arpeggio_; 
-  Arpeggio_req *arpeggio_req_;
-  Link_array <Grob> stems_;
-  Link_array<Grob> supports_;
+  Item *arpeggio_;
+  Music *arpeggio_req_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -43,73 +36,65 @@ Arpeggio_engraver::Arpeggio_engraver ()
 }
 
 bool
-Arpeggio_engraver::try_music (Music* m)
+Arpeggio_engraver::try_music (Music *m)
 {
   if (!arpeggio_req_)
     {
-      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
-	{
-	  arpeggio_req_ = a;
-	  return true;
-	}
+      arpeggio_req_ = m;
     }
-  return false;
+  return true;
 }
 
 void
 Arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
-  if (arpeggio_req_)
+  if (arpeggio_)
     {
-      if (Stem::has_interface (info.elem_l_))
+      if (Stem::has_interface (info.grob_))
 	{
-	  stems_.push (info.elem_l_);
+	  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.elem_l_))
+      else if (Rhythmic_head::has_interface (info.grob_))
+	{
+	  Side_position_interface::add_support (arpeggio_, info.grob_);
+	}
+      else if (Note_column::has_interface (info.grob_))
 	{
-	  supports_.push (info.elem_l_);
+	  info.grob_->set_property ("arpeggio", arpeggio_->self_scm ());
 	}
     }
 }
 
 void
-Arpeggio_engraver::create_grobs ()
+Arpeggio_engraver::process_music ()
 {
-  if (!arpeggio_ && !stems_.empty ())
+  if (arpeggio_req_)
     {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      arpeggio_->set_parent (stems_[0], Y_AXIS);
-      
-      for (int i = 0; i < stems_.size (); i++)
-	{
-	  Pointer_group_interface::add_element (arpeggio_, "stems", stems_[i]);
-	}
-      for (int i = 0; i < supports_.size (); i++)
-	{
-	  Side_position::add_support (arpeggio_, supports_[i]);
-	}
-      announce_grob (arpeggio_, arpeggio_req_);
+      arpeggio_ = make_item ("Arpeggio", arpeggio_req_->self_scm ());
     }
 }
 
 void
 Arpeggio_engraver::stop_translation_timestep ()
 {
-  if (arpeggio_)
-    {
-      typeset_grob (arpeggio_);
-      arpeggio_ = 0;
-    }
+  arpeggio_ = 0;
   arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
 }
 
-
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
-
+ADD_TRANSLATOR (Arpeggio_engraver,
+		/* descr */ "Generate an Arpeggio from a Arpeggio_req",
+		/* creats*/ "Arpeggio",
+		/* accepts */ "arpeggio-event",
+		/* acks  */ "stem-interface rhythmic-head-interface note-column-interface",
+		/* reads */ "",
+		/* write */ "");