patch::: 1.5.9.jcn1

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 9f142dc891d68b01b821a73c9c93a59d63035ea9..929ebf819172910baca6953dfaa9a7ccee5af495 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,28 +3,49 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
+#include "engraver.hh"
 #include "musical-request.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 create_grobs ();
+  virtual void start_translation_timestep ();
+  
+public:
+  Lyric_engraver ();
+  VIRTUAL_COPY_CONS (Translator);
+
+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))
     {
@@ -37,38 +58,40 @@ Lyric_engraver::do_try_music (Music*r)
 }
 
 void
-Lyric_engraver::do_process_music()
+Lyric_engraver::create_grobs ()
 {
   if (req_l_)
     {
-      text_p_=  new Item (get_property ("basicLyricTextProperties"));
+      text_p_=  new Item (get_property ("LyricText"));
       
-      text_p_->set_elt_property ("text",
-                                ly_str02scm   ((req_l_->text_str_ + " ").ch_C ()));
+      text_p_->set_grob_property ("text", req_l_->get_mus_property ("text"));
 
-      text_p_->add_offset_callback (&Side_position::aligned_on_self,X_AXIS);
       /*
        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 (paper_l()->get_var ("quartwidth")/2, X_AXIS);
       
-      announce_element (Score_element_info (text_p_, req_l_));
+      text_p_->translate_axis (0.66, X_AXIS);
+      
+      announce_grob (text_p_, req_l_);
+      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;
 }