* scm/define-grobs.scm (all-grob-descriptions): reorganize in

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

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index f9a2ee65bb30963457781189592e69ce5147d41e..494326f47ffd1871cca000c7ca3ca80c01c3ee76 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,115 +1,100 @@
-/*   
+/*
   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_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_;
+  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_grob (Grob_info info)
 {
-  if (arpeggio_req_)
+  if (arpeggio_)
     {
-      if (Stem::has_interface (info.elem_l_))
-       {
-         stems_.push (info.elem_l_);
-       }
-      else if (Rhythmic_head::has_interface (info.elem_l_)
-              || Local_key_item::has_interface (info.elem_l_))
+      if (Stem::has_interface (info.grob ()))
        {
-         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 ()
-{
-  if (!arpeggio_ && !stems_.empty ())
-    {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      arpeggio_->set_parent (stems_[0], Y_AXIS);
-      Side_position::set_axis (arpeggio_, X_AXIS);
-      Side_position::set_direction (arpeggio_, LEFT);
-      Staff_symbol_referencer::set_interface (arpeggio_);
-      Pointer_group_interface pgi (arpeggio_, "stems");
-      for (int i = 0; i < stems_.size (); i++)
+      /*
+       We can't catch local key items (accidentals) from Voice context,
+       see Local_key_engraver
+      */
+      else if (Rhythmic_head::has_interface (info.grob ()))
        {
-         pgi.add_element (stems_[i]);
-         //Side_position::add_support (arpeggio_, stems_[i]);
+         Side_position_interface::add_support (arpeggio_, info.grob ());
        }
-      for (int i = 0; i < supports_.size (); i++)
+      else if (Note_column::has_interface (info.grob ()))
        {
-         ;//Side_position::add_support (arpeggio_, supports_[i]);
+         info.grob ()->set_property ("arpeggio", arpeggio_->self_scm ());
        }
-      announce_element (arpeggio_, arpeggio_req_);
     }
 }
 
 void
-Arpeggio_engraver::do_pre_move_processing ()
+Arpeggio_engraver::process_music ()
 {
-  if (arpeggio_)
+  if (arpeggio_event_)
     {
-      typeset_element (arpeggio_);
-      arpeggio_ = 0;
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
-  arpeggio_req_ = 0;
-  stems_.clear ();
-  supports_.clear ();
 }
 
+void
+Arpeggio_engraver::stop_translation_timestep ()
+{
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
+}
 
-ADD_THIS_TRANSLATOR (Arpeggio_engraver);
-
+ADD_TRANSLATOR (Arpeggio_engraver,
+               /* descr */ "Generate an Arpeggio symbol",
+               /* creats*/ "Arpeggio",
+               /* accepts */ "arpeggio-event",
+               /* acks  */ "stem-interface rhythmic-head-interface note-column-interface",
+               /* reads */ "",
+               /* write */ "");