X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=ff3ce86c3aa607a4e8cbf6ba8aeae09600331a2f;hb=de658c9789658317b265eb7f3fd34a87c7a8f953;hp=ceba7c467e16cbc683b119e006a322e5072c83ab;hpb=a41bc3e06fca46daa875419b5dc00dd958e1fde0;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ceba7c467e..ff3ce86c3a 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,77 +3,102 @@
 
   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 "text-item.hh"
+#include "engraver.hh"
+#include "event.hh"
+#include "item.hh"
 #include "paper-def.hh"
-#include "lookup.hh"
-#include "paper-def.hh"
-#include "main.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:
+  Music * req_;
+  Item* text_;
+};
+
 
-Lyric_engraver::Lyric_engraver()
+
+
+Lyric_engraver::Lyric_engraver ()
 {
-  lreq_l_ =0;
-  lyric_item_p_ =0;
+  text_ =0;
+  req_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request (Request*r)
+Lyric_engraver::try_music (Music*r)
 {
-  Musical_req * m =r->access_Musical_req ();
-  if (!m || ! m->access_Lyric_req ()) 
-    return false;
-  lreq_l_ = m->access_Lyric_req ();
-
-  return true;
+  if (r->is_mus_type ("lyric-event"))
+    {
+      if (req_)
+	return false;
+      req_ =r;
+      return true;
+    }
+  return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::process_acknowledged_grobs ()
 {
-  if (lreq_l_) 
+  if (req_)
     {
-      Text_def *td_p = new Text_def;
-      td_p->text_str_ = lreq_l_->text_str_;
-      td_p->align_dir_ = LEFT;
-      Scalar style = get_property ("textstyle");
-      if (style.length_i ())
-	{
-	  td_p->style_str_ = style;
-	}
-      Scalar alignment = get_property ("textalignment");
-      if (alignment.isnum_b())
-	{
-	  td_p->align_dir_= (Direction)(int)alignment;
-	}
+      text_=  new Item (get_property ("LyricText"));
       
-      lyric_item_p_ =  new Text_item (td_p);
+      text_->set_grob_property ("text", req_->get_mus_property ("text"));
+
+      /*
+	We can't reach the notehead where we're centered from here. So
+	we kludge.
 
-      lyric_item_p_->dir_ = DOWN;
-      lyric_item_p_->fat_b_ = true;
-      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
+ (UGH UGH, pulled amount of space out of thin air)
+      */
+      
+      text_->translate_axis (0.66, X_AXIS);
+      
+      announce_grob(text_, req_->self_scm());
+      req_ = 0;
     }
 }
 
 void
-Lyric_engraver::do_post_move_processing()
+Lyric_engraver::stop_translation_timestep ()
 {
-  lreq_l_ =0;
+  if (text_)
+    {
+      typeset_grob (text_);
+      text_ =0;
+    }
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::start_translation_timestep ()
 {
-  if (lyric_item_p_)
-    {
-      typeset_element (lyric_item_p_);
-      lyric_item_p_ =0;
-    }
+  req_ =0;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Lyric_engraver);
+ENTER_DESCRIPTION(Lyric_engraver,
+/* descr */       "",
+/* creats*/       "",
+/* accepts */     "lyric-event",
+/* acks  */      "",
+/* reads */       "",
+/* write */       "");