* 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 8aee3f93971f5e926fd883dd18e83fbb0dc85a15..494326f47ffd1871cca000c7ca3ca80c01c3ee76 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,15 +1,13 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 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 "rhythmic-head.hh"
@@ -19,37 +17,32 @@
 class Arpeggio_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Arpeggio_engraver); 
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
+
 protected:
   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_;
+  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_event_)
     {
-      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
-       {
-         arpeggio_req_ = a;
-         return true;
-       }
+      arpeggio_event_ = m;
     }
-  return false;
+  return true;
 }
 
 void
@@ -57,25 +50,27 @@ Arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
   if (arpeggio_)
     {
-      if (Stem::has_interface (info.grob_l_))
+      if (Stem::has_interface (info.grob ()))
        {
-         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_);
+         if (!arpeggio_->get_parent (Y_AXIS))
+           arpeggio_->set_parent (info.grob (), Y_AXIS);
+
+         Pointer_group_interface::add_grob (arpeggio_,
+                                            ly_symbol2scm ("stems"),
+                                            info.grob ());
        }
-      
+
       /*
        We can't catch local key items (accidentals) from Voice context,
        see Local_key_engraver
       */
-      else if (Rhythmic_head::has_interface (info.grob_l_))
+      else if (Rhythmic_head::has_interface (info.grob ()))
        {
-         Side_position_interface::add_support (arpeggio_, info.grob_l_);
+         Side_position_interface::add_support (arpeggio_, info.grob ());
        }
-      else if (Note_column::has_interface (info.grob_l_ ))
+      else if (Note_column::has_interface (info.grob ()))
        {
-         info.grob_l_->set_grob_property ("arpeggio", arpeggio_->self_scm ());
+         info.grob ()->set_property ("arpeggio", arpeggio_->self_scm ());
        }
     }
 }
@@ -83,30 +78,23 @@ Arpeggio_engraver::acknowledge_grob (Grob_info info)
 void
 Arpeggio_engraver::process_music ()
 {
-  if (arpeggio_req_)
+  if (arpeggio_event_)
     {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      announce_grob(arpeggio_, arpeggio_req_->self_scm());
+      arpeggio_ = make_item ("Arpeggio", arpeggio_event_->self_scm ());
     }
 }
 
 void
 Arpeggio_engraver::stop_translation_timestep ()
 {
-  if (arpeggio_)
-    {
-      typeset_grob (arpeggio_);
-      arpeggio_ = 0;
-    }
-  arpeggio_req_ = 0;
+  arpeggio_ = 0;
+  arpeggio_event_ = 0;
 }
 
-
-
-
-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 */       "");
+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 */ "");