Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index e11f4ec222156d18672805fa1338aabbf36d97c6..176c9b7166157228e5eb82571d6685a5236bd671 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -14,9 +14,6 @@
 #include "multi-measure-rest.hh"
 #include "note-head.hh"
 #include "rest.hh"
-#include "stream-event.hh"
-
-#include "translator.icc"
 
 /**
    Generate texts for lyric syllables.  We only do one lyric at a time.
@@ -26,14 +23,14 @@ class Lyric_engraver : public Engraver
 {
 protected:
   void stop_translation_timestep ();
+  virtual bool try_music (Music *);
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (lyric);
 
 public:
   TRANSLATOR_DECLARATIONS (Lyric_engraver);
 
 private:
-  Stream_event *event_;
+  Music *event_;
   Item *text_;
   Item *last_text_;
 
@@ -47,11 +44,15 @@ Lyric_engraver::Lyric_engraver ()
   event_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Lyric_engraver, lyric);
-void
-Lyric_engraver::listen_lyric (Stream_event *ev)
+bool
+Lyric_engraver::try_music (Music *r)
 {
-  ASSIGN_EVENT_ONCE (event_, ev);
+  if (!event_)
+    {
+      event_ = r;
+      return true;
+    }
+  return false;
 }
 
 void
@@ -156,6 +157,8 @@ Lyric_engraver::stop_translation_timestep ()
   event_ = 0;
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Lyric_engraver,
                /* doc */ "",
                /* create */ "LyricText",