Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 70115d62fdcd5de334cb2acda79ceb9a49e41747..cb2ac141d9e975ec9a18e3f5677394b407a77fd2 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -17,12 +17,9 @@ using namespace std;
 #include "grob-array.hh"
 #include "international.hh"
 #include "item.hh"
-#include "stream-event.hh"
 #include "text-interface.hh"
 #include "warn.hh"
 
-#include "translator.icc"
-
 /**
    put stuff over or next to  bars.  Examples: bar numbers, marginal notes,
    rehearsal marks.
@@ -30,18 +27,18 @@ using namespace std;
 class Mark_engraver : public Engraver
 {
 
-  void create_items (Stream_event *);
+  void create_items (Music *);
   Item *text_;
-  Stream_event *mark_ev_;
+  Music *mark_ev_;
 
 public:
   TRANSLATOR_DECLARATIONS (Mark_engraver);
 
 protected:
+  virtual bool try_music (Music *ev);
   void process_music ();
   void stop_translation_timestep ();
 
-  DECLARE_TRANSLATOR_LISTENER (mark);
   DECLARE_ACKNOWLEDGER (break_alignment);
   DECLARE_ACKNOWLEDGER (break_aligned);
 };
@@ -101,7 +98,7 @@ Mark_engraver::stop_translation_timestep ()
 }
 
 void
-Mark_engraver::create_items (Stream_event *ev)
+Mark_engraver::create_items (Music *ev)
 {
   if (text_)
     return;
@@ -109,11 +106,11 @@ Mark_engraver::create_items (Stream_event *ev)
   text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
-void
-Mark_engraver::listen_mark (Stream_event *ev)
+bool
+Mark_engraver::try_music (Music *r)
 {
-  ASSIGN_EVENT_ONCE (mark_ev_, ev);
+  mark_ev_ = r;
+  return true;
 }
 
 /*
@@ -161,6 +158,8 @@ Mark_engraver::process_music ()
     }
 }
 
+#include "translator.icc"
+
 ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);