2003 -> 2004

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 1da3c69a4b44bf0595b2deecd26bd1cbde3745a5..23b98b095a09d94f7a11abba2767a5b6c8ca9fee 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "engraver.hh"
-#include "musical-request.hh"
+#include "event.hh"
 #include "item.hh"
 #include "paper-def.hh"
 #include "font-metric.hh"
@@ -23,13 +23,12 @@ class Lyric_engraver : public Engraver
 protected:
   virtual void stop_translation_timestep ();
   virtual bool try_music (Music *);
-  virtual void process_acknowledged_grobs ();
-  virtual void start_translation_timestep ();
+  virtual void process_music ();
   
 public:
   TRANSLATOR_DECLARATIONS(Lyric_engraver);
 private:
-  Lyric_req * req_;
+  Music * req_;
   Item* text_;
 };
 
@@ -45,36 +44,25 @@ Lyric_engraver::Lyric_engraver ()
 bool
 Lyric_engraver::try_music (Music*r)
 {
-  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+  if (r->is_mus_type ("lyric-event"))
     {
       if (req_)
        return false;
-      req_ =l;
+      req_ =r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::process_acknowledged_grobs ()
+Lyric_engraver::process_music ()
 {
   if (req_)
     {
-      text_=  new Item (get_property ("LyricText"));
+      text_=  make_item ("LyricText");
       
       text_->set_grob_property ("text", req_->get_mus_property ("text"));
-
-      /*
-       We can't reach the notehead where we're centered from here. So
-       we kludge.
-
- (UGH UGH, pulled amount of space out of thin air)
-      */
-      
-      text_->translate_axis (0.66, X_AXIS);
-      
-      announce_grob(text_, req_->self_scm());
-      req_ = 0;
+      announce_grob (text_, req_->self_scm());
     }
 }
 
@@ -86,11 +74,6 @@ Lyric_engraver::stop_translation_timestep ()
       typeset_grob (text_);
       text_ =0;
     }
-}
-
-void
-Lyric_engraver::start_translation_timestep ()
-{
   req_ =0;
 }
 
@@ -98,7 +81,7 @@ Lyric_engraver::start_translation_timestep ()
 ENTER_DESCRIPTION(Lyric_engraver,
 /* descr */       "",
 /* creats*/       "",
-/* accepts */     "general-music",
+/* accepts */     "lyric-event",
 /* acks  */      "",
 /* reads */       "",
 /* write */       "");