* lily/engraver-group-engraver.cc (do_announces): rename

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index f6b61316fa50995b51fa8a8ec7f5bceb09d39d99..dca8de3e89f845d47d898a5a091f97b189064a4f 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,27 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
+#include "engraver.hh"
 #include "musical-request.hh"
-#include "text-item.hh"
+#include "item.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
+#include "font-metric.hh"
+#include "side-position-interface.hh"
+
+/**
+   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_acknowledged_grobs ();
+  virtual void start_translation_timestep ();
+  
+public:
+  TRANSLATOR_DECLARATIONS(Lyric_engraver);
+private:
+  Lyric_req * req_l_;
+  Item* text_p_;
+};
 
-ADD_THIS_TRANSLATOR (Lyric_engraver);
 
 
-Lyric_engraver::Lyric_engraver()
+
+Lyric_engraver::Lyric_engraver ()
 {
   text_p_ =0;
   req_l_ =0;
 }
 
 bool
-Lyric_engraver::do_try_music (Music*r)
+Lyric_engraver::try_music (Music*r)
 {
   if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {
@@ -36,33 +56,48 @@ Lyric_engraver::do_try_music (Music*r)
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_acknowledged_grobs ()
 {
   if (req_l_)
     {
-      text_p_=  new Text_item;
-      text_p_->text_str_ = req_l_->text_str_;
-      text_p_->text_str_ += " ";       // ugh.
+      text_p_=  new Item (get_property ("LyricText"));
+      
+      text_p_->set_grob_property ("text", req_l_->get_mus_property ("text"));
 
-      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
+      /*
+       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_p_->translate_axis (0.66, X_AXIS);
       
-      announce_element (Score_element_info (text_p_, req_l_));
+      announce_grob(text_p_, req_l_->self_scm());
+      req_l_ = 0;
     }
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
   if (text_p_)
     {
-      typeset_element (text_p_);
+      typeset_grob (text_p_);
       text_p_ =0;
     }
 }
 
 void
-Lyric_engraver::do_post_move_processing ()
+Lyric_engraver::start_translation_timestep ()
 {
   req_l_ =0;
 }
 
+
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* acks  */       "",
+/* reads */       "",
+/* write */       "");