X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=062d6a816fa3cf3155eee6513329f51522f75d92;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=5a95deecdc545c817945a1b4c7d232d29cfb1629;hpb=7249d131a7b58117ad502f17975af50ea4144a05;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 5a95deecdc..062d6a816f 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,120 +1,106 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+
+  (c) 2000--2008 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 "local-key-item.hh"
 #include "rhythmic-head.hh"
 #include "side-position-interface.hh"
-#include "staff-symbol-referencer.hh"
+#include "stream-event.hh"
+#include "note-column.hh"
+#include "item.hh"
+
+#include "translator.icc"
 
 class Arpeggio_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  Arpeggio_engraver ();
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
 protected:
-  virtual void acknowledge_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing ();
-  virtual bool do_try_music (Music *);
-
+  void process_music ();
+  void stop_translation_timestep ();
+  DECLARE_TRANSLATOR_LISTENER (arpeggio);
 private:
-  Item* arpeggio_; 
-  Arpeggio_req *arpeggio_req_;
-  Link_array <Score_element> stems_;
-  Link_array<Score_element> supports_;
+  Item *arpeggio_;
+  Stream_event *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
-bool
-Arpeggio_engraver::do_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_element (Score_element_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
 {
-  if (arpeggio_req_)
+  if (arpeggio_)
     {
-      if (Stem::has_interface (info.elem_l_))
-	{
-	  stems_.push (info.elem_l_);
-	}
-      
-      else
-
-  /*
-    We can't catch local key items from Voice context, but let's leave
-    it here in case someone moves this stuff around.  */
-	if (Rhythmic_head::has_interface (info.elem_l_)
-	       || Local_key_item::has_interface (info.elem_l_))
-	{
-	  supports_.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 ());
     }
 }
+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_acknowledged ()
+Arpeggio_engraver::process_music ()
 {
-  if (!arpeggio_ && !stems_.empty ())
+  if (arpeggio_event_)
     {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      arpeggio_->set_parent (stems_[0], Y_AXIS);
-      
-      //      Staff_symbol_referencer::set_interface (arpeggio_);
-
-      for (int i = 0; i < stems_.size (); i++)
-	{
-	  Pointer_group_interface::add_element (arpeggio_, "stems", stems_[i]);
-	  //Side_position::add_support (arpeggio_, stems_[i]);
-	}
-      for (int i = 0; i < supports_.size (); i++)
-	{
-	  ;//Side_position::add_support (arpeggio_, supports_[i]);
-	}
-      announce_element (arpeggio_, arpeggio_req_);
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
 }
 
 void
-Arpeggio_engraver::do_pre_move_processing ()
+Arpeggio_engraver::stop_translation_timestep ()
 {
-  if (arpeggio_)
-    {
-      typeset_element (arpeggio_);
-      arpeggio_ = 0;
-    }
-  arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
 }
 
+ADD_ACKNOWLEDGER (Arpeggio_engraver, stem);
+ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head);
+
+ADD_TRANSLATOR (Arpeggio_engraver,
+		/* doc */
+		"Generate an Arpeggio symbol.",
+
+		/* create */
+		"Arpeggio",
 
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
+		/* read */
+		"",
 
+		/* write */
+		""
+		);