2003 -> 2004

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 5c1117637ccff19369c6279a3ba2d63aa532a98d..23b98b095a09d94f7a11abba2767a5b6c8ca9fee 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,76 +3,85 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
+#include "engraver.hh"
+#include "event.hh"
 #include "item.hh"
 #include "paper-def.hh"
 #include "font-metric.hh"
 #include "side-position-interface.hh"
 
-ADD_THIS_TRANSLATOR (Lyric_engraver);
+/**
+   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   Multiple copies of this engraver should be used to do multiple voices.
+ */
+class Lyric_engraver : public Engraver 
+{
+protected:
+  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *);
+  virtual void process_music ();
+  
+public:
+  TRANSLATOR_DECLARATIONS(Lyric_engraver);
+private:
+  Music * req_;
+  Item* text_;
+};
+
+
 
 
-Lyric_engraver::Lyric_engraver()
+Lyric_engraver::Lyric_engraver ()
 {
-  text_p_ =0;
-  req_l_ =0;
+  text_ =0;
+  req_ =0;
 }
 
 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_l_)
+      if (req_)
        return false;
-      req_l_ =l;
+      req_ =r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::deprecated_process_music()
+Lyric_engraver::process_music ()
 {
-  if (req_l_)
+  if (req_)
     {
-      text_p_=  new Item (get_property ("LyricText"));
-      
-      text_p_->set_grob_property ("text", req_l_->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_=  make_item ("LyricText");
       
-      text_p_->translate_axis (0.66, X_AXIS);
-      
-      announce_grob (text_p_, req_l_);
-      req_l_ = 0;
+      text_->set_grob_property ("text", req_->get_mus_property ("text"));
+      announce_grob (text_, req_->self_scm());
     }
 }
 
 void
-Lyric_engraver::stop_translation_timestep()
+Lyric_engraver::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      typeset_grob (text_p_);
-      text_p_ =0;
+      typeset_grob (text_);
+      text_ =0;
     }
-}
-
-void
-Lyric_engraver::start_translation_timestep ()
-{
-  req_l_ =0;
+  req_ =0;
 }
 
 
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");