patch::: 1.3.63.uu1: Re: Lilypond?

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index da7102b1f7212bfef8c534b2158823c42db4ee96..5856b9231860be6725fce25e1a8811540e0bd17b 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,77 +3,74 @@
 
   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 "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)
 {
-  Musical_req * m =dynamic_cast <Musical_req *> (r);
-  if (!m || ! dynamic_cast <Lyric_req *> (m)) 
-    return false;
-  lreq_l_ = dynamic_cast <Lyric_req *> (m);
-
-  return true;
+  if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+    {
+      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 ("basicLyricTextProperties"));
       
-      lyric_item_p_ =  new Text_item (td_p);
+      text_p_->set_elt_property ("text",
+                                ly_str02scm   ((req_l_->text_str_ + " ").ch_C ()));
 
-      lyric_item_p_->dir_ = DOWN;
-      lyric_item_p_->fat_b_ = true;
-      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
+      text_p_->add_offset_callback (&Side_position_interface::aligned_on_self,X_AXIS);
+      /*
+       We can't reach the notehead where we're centered from here. So
+       we kludge.
+      */
+      text_p_->translate_axis (paper_l()->get_var ("quartwidth")/2, X_AXIS);
+      
+      announce_element (Score_element_info (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);