''

[lilypond.git] / lily / arpeggio-engraver.cc

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 5a95deecdc545c817945a1b4c7d232d29cfb1629..8aee3f93971f5e926fd883dd18e83fbb0dc85a15 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "engraver.hh"
@@ -12,28 +12,24 @@
 #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_element (Score_element_info);
-  virtual void process_acknowledged ();
-  virtual void do_pre_move_processing ();
-  virtual bool do_try_music (Music *);
+  virtual void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+
+  virtual 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_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
@@ -43,7 +39,7 @@ Arpeggio_engraver::Arpeggio_engraver ()
 }
 
 bool
-Arpeggio_engraver::do_try_music (Music* m)
+Arpeggio_engraver::try_music (Music* m)
 {
   if (!arpeggio_req_)
     {
@@ -57,64 +53,60 @@ Arpeggio_engraver::do_try_music (Music* m)
 }
 
 void
-Arpeggio_engraver::acknowledge_element (Score_element_info info)
+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_l_))
        {
-         stems_.push (info.elem_l_);
+         if (!arpeggio_->get_parent  (Y_AXIS))
+           arpeggio_->set_parent (info.grob_l_, Y_AXIS);
+      
+         Pointer_group_interface::add_grob (arpeggio_, ly_symbol2scm ("stems"), info.grob_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_))
+      /*
+       We can't catch local key items (accidentals) from Voice context,
+       see Local_key_engraver
+      */
+      else if (Rhythmic_head::has_interface (info.grob_l_))
+       {
+         Side_position_interface::add_support (arpeggio_, info.grob_l_);
+       }
+      else if (Note_column::has_interface (info.grob_l_ ))
        {
-         supports_.push (info.elem_l_);
+         info.grob_l_->set_grob_property ("arpeggio", arpeggio_->self_scm ());
        }
     }
 }
 
 void
-Arpeggio_engraver::process_acknowledged ()
+Arpeggio_engraver::process_music ()
 {
-  if (!arpeggio_ && !stems_.empty ())
+  if (arpeggio_req_)
     {
       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_);
+      announce_grob(arpeggio_, arpeggio_req_->self_scm());
     }
 }
 
 void
-Arpeggio_engraver::do_pre_move_processing ()
+Arpeggio_engraver::stop_translation_timestep ()
 {
   if (arpeggio_)
     {
-      typeset_element (arpeggio_);
+      typeset_grob (arpeggio_);
       arpeggio_ = 0;
     }
   arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
 }
 
 
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
 
+
+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 */       "");