small fixes

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

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index dccb27e6bac92a6ac2e4afc8ee4a5517ac1684a9..8aee3f93971f5e926fd883dd18e83fbb0dc85a15 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -3,72 +3,110 @@
   
   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"
 #include "group-interface.hh"
 #include "item.hh"
+#include "musical-request.hh"
 #include "arpeggio.hh"
 #include "stem.hh"
+#include "rhythmic-head.hh"
+#include "side-position-interface.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 void acknowledge_grob (Grob_info);
+  virtual void process_music ();
+
+  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *);
 
 private:
   Item* arpeggio_; 
-  Link_array <Score_element> stems_;
+  Arpeggio_req *arpeggio_req_;
 };
 
 Arpeggio_engraver::Arpeggio_engraver ()
 {
   arpeggio_ = 0;
+  arpeggio_req_ = 0;
 }
 
-void
-Arpeggio_engraver::acknowledge_element (Score_element_info info)
+bool
+Arpeggio_engraver::try_music (Music* m)
 {
-  if (Stem::has_interface (info.elem_l_))
+  if (!arpeggio_req_)
     {
-      stems_.push (info.elem_l_);
+      if (Arpeggio_req *a = dynamic_cast<Arpeggio_req*> (m))
+       {
+         arpeggio_req_ = a;
+         return true;
+       }
     }
+  return false;
 }
 
 void
-Arpeggio_engraver::process_acknowledged ()
+Arpeggio_engraver::acknowledge_grob (Grob_info info)
 {
-  if (!arpeggio_ && !stems_.empty ())
+  if (arpeggio_)
     {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      Pointer_group_interface pgi (arpeggio_, "stems");
-      for (int i = 0; i < stems_.size (); i++)
+      if (Stem::has_interface (info.grob_l_))
        {
-         pgi.add_element (stems_[i]);
-         arpeggio_->add_dependency (stems_[i]);
+         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_);
+       }
+      
+      /*
+       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_ ))
+       {
+         info.grob_l_->set_grob_property ("arpeggio", arpeggio_->self_scm ());
        }
-      announce_element (arpeggio_, 0);
     }
 }
 
 void
-Arpeggio_engraver::do_pre_move_processing ()
+Arpeggio_engraver::process_music ()
+{
+  if (arpeggio_req_)
+    {
+      arpeggio_ = new Item (get_property ("Arpeggio"));
+      announce_grob(arpeggio_, arpeggio_req_->self_scm());
+    }
+}
+
+void
+Arpeggio_engraver::stop_translation_timestep ()
 {
   if (arpeggio_)
     {
-      typeset_element (arpeggio_);
+      typeset_grob (arpeggio_);
       arpeggio_ = 0;
     }
-  stems_.clear ();
+  arpeggio_req_ = 0;
 }
 
 
-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 */       "");