X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=23b98b095a09d94f7a11abba2767a5b6c8ca9fee;hb=d12d721e46d077c3e9557567f84c0eb401fc277a;hp=28d1086e0283a7745eb99d31678e213b30f97866;hpb=d3190e49a8f73d44b2e11034323b8f3592f288d6;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 28d1086e02..23b98b095a 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,52 +3,85 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 "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"
 
-Lyric_engraver::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 ()
+{
+  text_ =0;
+  req_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request(Request*r)
+Lyric_engraver::try_music (Music*r)
 {
-    Musical_req * m =r->musical();
-    if (!m || ! m->lreq_l()) 
+  if (r->is_mus_type ("lyric-event"))
+    {
+      if (req_)
 	return false;
-    lreq_arr_.push(m->lreq_l());
-
-    return true;
+      req_ =r;
+      return true;
+    }
+  return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-    Text_item * last_item_l =0;
-    for (int i=0; i < lreq_arr_.size(); i++) {
-	Text_item *lp = new Text_item(lreq_arr_[i]->tdef_p_ );
-	lp->dir_i_ = -1;
-	lp->fat_b_ = true;
-	if (last_item_l)
-	    lp->add_support(last_item_l);
-	last_item_l = lp;
-	typeset_element(lp);
+  if (req_)
+    {
+      text_=  make_item ("LyricText");
+      
+      text_->set_grob_property ("text", req_->get_mus_property ("text"));
+      announce_grob (text_, req_->self_scm());
     }
 }
 
 void
-Lyric_engraver::do_post_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-    lreq_arr_.set_size(0);
+  if (text_)
+    {
+      typeset_grob (text_);
+      text_ =0;
+    }
+  req_ =0;
 }
 
 
-IMPLEMENT_STATIC_NAME(Lyric_engraver);
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_ENGRAVER(Lyric_engraver);
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");