X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=6b63b428b6fb510e0150c1f9be4efe0ee073c8d2;hb=7095841e441b2ad2d8ca798e6d1d241e57bdd0c5;hp=84c5fc87f7b1ef393457d26ef3a22ebb42386177;hpb=3bcb994d1aae1a51345f33a7c0851ce9da7b4ede;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 84c5fc87f7..6b63b428b6 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--1998 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 "g-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_ =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"))
     {
-      lyric_req_l_arr_.push (l);
+      if (req_)
+	return false;
+      req_ =r;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_music ()
 {
-  if (text_p_arr_.size ())
-    return;
-
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (req_)
     {
-      Lyric_req* request_l = lyric_req_l_arr_[i];
-      G_text_item* item_p =  new G_text_item;
-      item_p->text_str_ = request_l->text_str_;
-
-      Scalar style = get_property ("textstyle", 0);
-      if (style.length_i ())
-	item_p->style_str_ = style;
-      if (i)
-	{
-	  Real dy = paper ()->lookup_l (0)-> text
-	    (item_p->style_str_, String ("Cg")).dim_. y ().length ();
-	  dy *= 1.1;
-	  item_p->translate_axis (-i * dy, Y_AXIS);
-	}
+      text_=  make_item ("LyricText");
       
-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_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 ()
 {
-  for (int i=0; i < text_p_arr_.size (); i++)
+  if (text_)
     {
-      typeset_element (text_p_arr_[i]);
+      typeset_grob (text_);
+      text_ =0;
     }
-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
+  req_ =0;
 }
 
+
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");