X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Farpeggio-engraver.cc;h=b488e1be6468fe3d94d8a43cbc9d4511a8f45a6a;hb=913f4a33e9b60b94e673ae48c1fb299f1465b4ad;hp=8a5513c3e6229a2c0757c7a4d23ba2b65e848d2a;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 8a5513c3e6..b488e1be64 100644
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,119 +1,106 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 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:
-  TRANSLATOR_DECLARATIONS(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_grob (Grob_info);
-  virtual void create_grobs ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  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_event_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
-  arpeggio_req_ = 0;
+  arpeggio_event_ = 0;
 }
 
 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;
-	}
-    }
-  return false;
+  if (!arpeggio_event_)
+    arpeggio_event_ = m;
+  return true;
 }
 
 void
-Arpeggio_engraver::acknowledge_grob (Grob_info info)
+Arpeggio_engraver::acknowledge_stem (Grob_info info)
 {
-  if (arpeggio_req_)
+  if (arpeggio_)
     {
-      if (Stem::has_interface (info.grob_l_))
-	{
-	  stems_.push (info.grob_l_);
-	}
-      
-      /*
-	We can't catch local key items (accidentals) from Voice context,
-	see Local_key_engraver
-      */
-      else if (Rhythmic_head::has_interface (info.grob_l_))
-	{
-	  supports_.push (info.grob_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::create_grobs ()
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (!arpeggio_ && !stems_.empty ())
-    {
-      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_interface::add_support (arpeggio_, supports_[i]);
-	}
-      announce_grob (arpeggio_, arpeggio_req_);
-    }
+  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::stop_translation_timestep ()
+Arpeggio_engraver::acknowledge_note_column (Grob_info info)
 {
   if (arpeggio_)
-    {
-      typeset_grob (arpeggio_);
-      arpeggio_ = 0;
-    }
-  arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
+    info.grob ()->set_object ("arpeggio", arpeggio_->self_scm ());
 }
 
+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_ACKNOWLEDGER (Arpeggio_engraver, stem)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, rhythmic_head)
+  ADD_ACKNOWLEDGER (Arpeggio_engraver, note_column)
 
-ENTER_DESCRIPTION(Arpeggio_engraver,
-/* descr */       "Generate an Arpeggio from a Arpeggio_req",
-/* creats*/       "Arpeggio",
-/* acks  */       "stem-interface rhythmic-head-interface",
-/* reads */       "",
-/* write */       "");
+  ADD_TRANSLATOR (Arpeggio_engraver,
+		  /* doc */ "Generate an Arpeggio symbol",
+		  /* create */ "Arpeggio",
+		  /* accept */ "arpeggio-event",
+		  /* read */ "",
+		  /* write */ "");