Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/metronome-engraver.cc b/lily/metronome-engraver.cc
index 2aba83882d53662048dd0e29eee7486f877b4be8..21eb711a24636c21f8c480c8238ead3397b5f8fa 100644 (file)
--- a/lily/metronome-engraver.cc
+++ b/lily/metronome-engraver.cc
@@ -3,114 +3,99 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <ctype.h>
+#include <cctype>
+using namespace std;
 
-#include "bar-line.hh"
-#include "time-signature.hh"
 #include "engraver.hh"
-#include "engraver-group-engraver.hh"
-#include "item.hh"
+
+#include "note-column.hh"
+#include "context.hh"
+#include "grob-array.hh"
 
 /**
-  put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
-  rehearsal marks.
- */
+   put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
+   rehearsal marks.
+*/
 class Metronome_mark_engraver : public Engraver
 {
 public:
-  TRANSLATOR_DECLARATIONS(Metronome_mark_engraver);
+  TRANSLATOR_DECLARATIONS (Metronome_mark_engraver);
 protected:
-  Item* text_;
-  Grob *   bar_line_;
-  
+  Item *text_;
+  Grob *bar_line_;
+  Music *mark_ev_;
+
+  void create_items (Music *);
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  void create_items (Music*);
-  virtual bool try_music (Music *req);
-  virtual void process_music ();
-  
-private:
-  Music * mark_req_;
+  void stop_translation_timestep ();
+  virtual bool try_music (Music *ev);
+  void process_music ();
 };
 
 Metronome_mark_engraver::Metronome_mark_engraver ()
 {
-  text_ =0;
-  mark_req_ = 0;
+  text_ = 0;
+  mark_ev_ = 0;
 }
 
 void
-Metronome_mark_engraver::acknowledge_grob (Grob_info inf)
-{
-  if (Bar_line::has_interface (inf.grob_))
-    {
-      bar_line_ = inf.grob_;
-    }
-  else if (text_ && Time_signature::has_interface (inf.grob_))
-    {
-      text_->set_parent (inf.grob_, X_AXIS);
-    }
-}
-
-void 
 Metronome_mark_engraver::stop_translation_timestep ()
 {
   if (text_)
     {
-      if (bar_line_ && !text_->get_parent (X_AXIS))
-       text_->set_parent (bar_line_, X_AXIS);
-      
-      text_->set_grob_property ("side-support-elements" , get_property ("stavesFound"));
-      typeset_grob (text_);
-      text_ =0;
+      Grob *mc = unsmob_grob (get_property ("currentMusicalColumn"));
+      text_->set_parent (mc, X_AXIS);
+      text_->set_object ("side-support-elements",
+                        grob_list_to_grob_array (get_property ("stavesFound")));
+
+      text_ = 0;
     }
-  mark_req_ = 0;
+  mark_ev_ = 0;
 }
 
-
 void
 Metronome_mark_engraver::create_items (Music *rq)
 {
   if (text_)
     return;
 
-  SCM s = get_property ("MetronomeMark");
-  text_ = new Item (s);
-
-  announce_grob(text_, rq->self_scm());
+  text_ = make_item ("MetronomeMark", rq->self_scm ());
 }
 
-
 bool
-Metronome_mark_engraver::try_music (Music* r)
+Metronome_mark_engraver::try_music (Music *r)
 {
-  mark_req_ = r;
+  mark_ev_ = r;
   return true;
 }
 
 void
 Metronome_mark_engraver::process_music ()
 {
-  if (mark_req_)
+  if (mark_ev_)
     {
-      create_items (mark_req_);
+      create_items (mark_ev_);
 
       SCM proc = get_property ("metronomeMarkFormatter");
-      SCM result= scm_call_2 (proc, mark_req_->self_scm (),
-                             daddy_trans_->self_scm()); 
-      
-      text_->set_grob_property ("text", result);
+      SCM result = scm_call_2 (proc, mark_ev_->self_scm (),
+                              context ()->self_scm ());
+
+      text_->set_property ("text", result);
     }
 }
 
-ENTER_DESCRIPTION(Metronome_mark_engraver,
-/* descr */       "Engrave metro nome marking. This delegates the real work to the function in the metronomeMarkFormatter property",
-/* creats*/       "MetronomeMark",
-/* accepts */     "metronome-change-event",
-/* acks  */       "time-signature-interface bar-line-interface",
-/* reads */       "stavesFound metronomeMarkFormatter",
-/* write */       "");
+#include "translator.icc"
+
+ADD_TRANSLATOR (Metronome_mark_engraver,
+               /* doc */ "Engrave metro nome marking. This delegates the formatting work "
+               "to the function in the metronomeMarkFormatter property. "
+               "The mark is put over all staves. "
+               "The staves are taken from the @code{stavesFound} property, "
+               "which is maintained by @code{@ref{Staff_collecting_engraver}}. ",
+               /* create */ "MetronomeMark",
+               /* accept */ "metronome-change-event",
+               /* read */ "stavesFound metronomeMarkFormatter",
+               /* write */ "");