release: 1.3.101

[lilypond.git] / lily / lyric-engraver.cc

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 9fb403f2da0d2c264553e05c6f687017515f0bf5..09e9fc9ee94eacf41e0e234bee8a5ac5b72c86dc 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,23 +3,24 @@
 
   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 "dimensions.hh"
+#include "font-metric.hh"
+#include "side-position-interface.hh"
+
+ADD_THIS_TRANSLATOR (Lyric_engraver);
 
-ADD_THIS_TRANSLATOR(Lyric_engraver);
 
 Lyric_engraver::Lyric_engraver()
 {
+  text_p_ =0;
+  req_l_ =0;
 }
 
 bool
@@ -27,52 +28,50 @@ Lyric_engraver::do_try_music (Music*r)
 {
   if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {
-      lyric_req_l_arr_.push (l);
+      if (req_l_)
+       return false;
+      req_l_ =l;
       return true;
     }
   return false;
 }
 
 void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::do_process_music()
 {
-  if (text_p_arr_.size ())
-    return;
-
-  Scalar style = get_property ("textstyle");
-  Scalar alignment = get_property ("textalignment");
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (req_l_)
     {
-      Lyric_req* request_l = lyric_req_l_arr_[i];
-      Text_def* text_p = new Text_def;
-      text_p->text_str_ = request_l->text_str_;
-      text_p->align_dir_ = LEFT;
-      if (style.length_i ())
-       text_p->style_str_ = style;
-      if (alignment.isnum_b())
-       text_p->align_dir_= (Direction)(int)alignment;
+      text_p_=  new Item (get_property ("LyricText"));
+      
+      text_p_->set_elt_property ("text", req_l_->get_mus_property ("text"));
+
+      /*
+       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_item* item_p =  new Text_item (text_p);
-      item_p->dir_ = DOWN;
-      item_p->fat_b_ = true;
-      // urg
-      // item_p->translate (Offset (0, (i - 1) * item_p->height ().length_i ()));
-//      if (i && ((Text_def*)text_p_arr_[i - 1]->tdef_p_)->text_str_.length_i ())
-      // urg, when/how can one get the heigt of this thing?
-      item_p->translate (Offset (0, - i * 12 PT));
-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_l));
+      text_p_->translate_axis (0.66, X_AXIS);
+      
+      announce_element (text_p_, req_l_);
     }
 }
 
 void
 Lyric_engraver::do_pre_move_processing()
 {
-  for (int i=0; i < text_p_arr_.size (); i++)
+  if (text_p_)
     {
-      typeset_element (text_p_arr_[i]);
+      typeset_element (text_p_);
+      text_p_ =0;
     }
-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
 }
 
+void
+Lyric_engraver::do_post_move_processing ()
+{
+  req_l_ =0;
+}
+
+