X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-engraver.cc;h=09e9fc9ee94eacf41e0e234bee8a5ac5b72c86dc;hb=867530093ed5374d6e28d2c11a933f3b991c226e;hp=9555cad7ebbd1182bb65817d23a025ad13085d0f;hpb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;p=lilypond.git

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 9555cad7eb..09e9fc9ee9 100644
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,77 +3,75 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 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 "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"
+
+ADD_THIS_TRANSLATOR (Lyric_engraver);
+
 
 Lyric_engraver::Lyric_engraver()
 {
-  lreq_l_ =0;
-  lyric_item_p_ =0;
+  text_p_ =0;
+  req_l_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request (Request*r)
+Lyric_engraver::do_try_music (Music*r)
 {
-  if (Lyric_req * lr = dynamic_cast <Lyric_req *> (r))
+  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {
-      lreq_l_ = lr;
+      if (req_l_)
+	return false;
+      req_l_ =l;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::do_process_music()
 {
-  if (lreq_l_) 
+  if (req_l_)
     {
-      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_p_=  new Item (get_property ("LyricText"));
       
-      lyric_item_p_ =  new Text_item (td_p);
+      text_p_->set_elt_property ("text", req_l_->get_mus_property ("text"));
 
-      lyric_item_p_->dir_ = DOWN;
-      lyric_item_p_->fat_b_ = true;
-      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
+      /*
+	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 (0.66, X_AXIS);
+      
+      announce_element (text_p_, req_l_);
     }
 }
 
 void
-Lyric_engraver::do_post_move_processing()
+Lyric_engraver::do_pre_move_processing()
 {
-  lreq_l_ =0;
+  if (text_p_)
+    {
+      typeset_element (text_p_);
+      text_p_ =0;
+    }
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::do_post_move_processing ()
 {
-  if (lyric_item_p_)
-    {
-      typeset_element (lyric_item_p_);
-      lyric_item_p_ =0;
-    }
+  req_l_ =0;
 }
 
 
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Lyric_engraver);