X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Flyric-engraver.cc;h=850326cb57d7cfd8b5a10522bb926db916eeb12f;hb=cd93507bb0b0559c7d916c1b19d7ac1f83d1cc8e;hp=080546f2f5fe6524e18e880304043fb607b9f1b1;hpb=3a0e9efb7f067e5b334ba0596b95e15d96d7cc49;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 080546f2f5..850326cb57 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,70 +3,85 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-engraver.hh"
-#include "musical-request.hh"
-#include "text-item.hh"
+#include "engraver.hh"
+#include "event.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_music ();
+  
+public:
+  TRANSLATOR_DECLARATIONS(Lyric_engraver);
+private:
+  Music * req_;
+  Item* text_;
+};
 
-ADD_THIS_TRANSLATOR (Lyric_engraver);
 
 
-Lyric_engraver::Lyric_engraver()
+
+Lyric_engraver::Lyric_engraver ()
 {
-  text_p_ =0;
-  req_l_ =0;
+  text_ =0;
+  req_ =0;
 }
 
 bool
-Lyric_engraver::do_try_music (Music*r)
+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::do_process_requests()
+Lyric_engraver::process_music ()
 {
-  if (req_l_)
+  if (req_)
     {
-      text_p_=  new Text_item;
-      text_p_->text_str_ = req_l_->text_str_;
-      text_p_->text_str_ += " ";	// ugh.
-
-      SCM style = get_property ("textStyle", 0);
-      if (gh_string_p(style))
-	text_p_->style_str_ = ly_scm2string (style);
-
-      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
+      text_=  new Item (get_property ("LyricText"));
       
-      announce_element (Score_element_info (text_p_, req_l_));
+      text_->set_grob_property ("text", req_->get_mus_property ("text"));
+      announce_grob (text_, req_->self_scm());
     }
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-  if (text_p_)
+  if (text_)
     {
-      typeset_element (text_p_);
-      text_p_ =0;
+      typeset_grob (text_);
+      text_ =0;
     }
+  req_ =0;
 }
 
-void
-Lyric_engraver::do_post_move_processing ()
-{
-  req_l_ =0;
-}
 
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");