Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc
index 19fc31342bd74f778adb30b972c439c3fe2de89c..fd28a41e1fc4ce36a726a273e78e444572495baf 100644 (file)
--- a/lily/arpeggio-engraver.cc
+++ b/lily/arpeggio-engraver.cc
@@ -1,113 +1,106 @@
-/*   
+/*
   arpeggio-engraver.cc -- implement Arpeggio_engraver
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2002 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+
+  (c) 2000--2006 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 "rhythmic-head.hh"
 #include "side-position-interface.hh"
 #include "note-column.hh"
 
+#include "translator.icc"
+
 class Arpeggio_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Arpeggio_engraver); 
-protected:
-  virtual void acknowledge_grob (Grob_info);
-  virtual void process_music ();
+  TRANSLATOR_DECLARATIONS (Arpeggio_engraver);
 
-  virtual void stop_translation_timestep ();
+  void acknowledge_stem (Grob_info);
+  void acknowledge_rhythmic_head (Grob_info);
+  void acknowledge_note_column (Grob_info);
+protected:
+  void process_music ();
+  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_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_)
     {
-      if (Stem::has_interface (info.grob_))
-       {
-         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_))
-       {
-         Side_position_interface::add_support (arpeggio_, info.grob_);
-       }
-      else if (Note_column::has_interface (info.grob_ ))
-       {
-         info.grob_->set_grob_property ("arpeggio", arpeggio_->self_scm ());
-       }
+      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_music ()
+Arpeggio_engraver::acknowledge_rhythmic_head (Grob_info info)
 {
-  if (arpeggio_req_)
-    {
-      arpeggio_ = new Item (get_property ("Arpeggio"));
-      announce_grob(arpeggio_, arpeggio_req_->self_scm());
-    }
+  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;
+    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",
-/* accepts */     "general-music",
-/* acks  */      "stem-interface rhythmic-head-interface note-column-interface",
-/* reads */       "",
-/* write */       "");
+  ADD_TRANSLATOR (Arpeggio_engraver,
+                 /* doc */ "Generate an Arpeggio symbol",
+                 /* create */ "Arpeggio",
+                 /* accept */ "arpeggio-event",
+                 /* read */ "",
+                 /* write */ "");