Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

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

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index cb2ac141d9e975ec9a18e3f5677394b407a77fd2..984eb687a096a58bd3902234c952d587704ada98 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <cctype>
@@ -17,9 +17,12 @@ 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.
@@ -27,18 +30,18 @@ using namespace std;
 class Mark_engraver : public Engraver
 {
 
-  void create_items (Music *);
+  void create_items (Stream_event *);
   Item *text_;
-  Music *mark_ev_;
+  Stream_event *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);
 };
@@ -61,8 +64,8 @@ Mark_engraver::acknowledge_break_aligned (Grob_info inf)
   Grob *s = inf.grob ();
   if (text_
       && !text_->get_parent (X_AXIS)
-      && (text_->get_property_data (ly_symbol2scm ("break-align-symbol"))
-         == s->get_property_data (ly_symbol2scm ("break-align-symbol")))
+      && (text_->get_property_data ("break-align-symbol")
+         == s->get_property_data ("break-align-symbol"))
       && Axis_group_interface::has_interface (s))
     {
       /*
@@ -98,7 +101,7 @@ Mark_engraver::stop_translation_timestep ()
 }
 
 void
-Mark_engraver::create_items (Music *ev)
+Mark_engraver::create_items (Stream_event *ev)
 {
   if (text_)
     return;
@@ -106,11 +109,11 @@ Mark_engraver::create_items (Music *ev)
   text_ = make_item ("RehearsalMark", ev->self_scm ());
 }
 
-bool
-Mark_engraver::try_music (Music *r)
+IMPLEMENT_TRANSLATOR_LISTENER (Mark_engraver, mark);
+void
+Mark_engraver::listen_mark (Stream_event *ev)
 {
-  mark_ev_ = r;
-  return true;
+  ASSIGN_EVENT_ONCE (mark_ev_, ev);
 }
 
 /*
@@ -158,8 +161,6 @@ Mark_engraver::process_music ()
     }
 }
 
-#include "translator.icc"
-
 ADD_ACKNOWLEDGER (Mark_engraver, break_aligned);
 ADD_ACKNOWLEDGER (Mark_engraver, break_alignment);
 
@@ -172,7 +173,6 @@ ADD_TRANSLATOR (Mark_engraver,
                "end up on the same Y-location",
                
                /* create */ "RehearsalMark",
-               /* accept */ "mark-event",
                /* read */
                "markFormatter "
                "rehearsalMark "