X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=5c82930b4f14fdd8d49a64077c21fddadec0ba29;hb=2c22efe5a46a37065b10c3f51c5d7db00d07d318;hp=7455bf2255516d68c520c259bc116ca45017ed17;hpb=c931e40e0b37f87c2b7c27aa5a2a0633b371d962;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 7455bf2255..5c82930b4f 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,115 +1,114 @@
-/*   
+/*
   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 "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 "note-column.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);
+  void acknowledge_note_column (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 ();
+  virtual bool try_music (Music *);
 private:
-  Item* arpeggio_; 
-  Arpeggio_req *arpeggio_req_;
-  Link_array <Score_element> stems_;
-  Link_array<Score_element> supports_;
+  Item *arpeggio_;
+  Music *arpeggio_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
 bool
-Arpeggio_engraver::do_try_music (Music* m)
+Arpeggio_engraver::try_music (Music *m)
 {
-  if (!arpeggio_req_)
+  if (!arpeggio_event_)
     {
-      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
-	{
-	  arpeggio_req_ = a;
-	  return true;
-	}
+      arpeggio_event_ = m;
     }
-  return false;
+  return true;
 }
 
 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_);
-	}
-      
-      /*
-	We can't catch local key items (accidentals) from Voice context,
-	see Local_key_engraver
-      */
-      else if (Rhythmic_head::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::process_acknowledged ()
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (!arpeggio_ && !stems_.empty ())
+  if (arpeggio_)
+
+    /*
+      We can't catch local key items (accidentals) from Voice context,
+      see Local_key_engraver
+    */
     {
-      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_element (arpeggio_, arpeggio_req_);
+      Side_position_interface::add_support (arpeggio_, info.grob ());
     }
 }
 
 void
-Arpeggio_engraver::do_pre_move_processing ()
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
 {
   if (arpeggio_)
     {
-      typeset_element (arpeggio_);
-      arpeggio_ = 0;
+      info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
     }
-  arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
 }
 
+void
+Arpeggio_engraver::process_music ()
+{
+  if (arpeggio_event_)
+    {
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
+    }
+}
+
+void
+Arpeggio_engraver::stop_translation_timestep ()
+{
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
+}
 
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
+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 */ "");