release: 1.1.0

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index 515bc7abe5a10afe673cc5f9c6d2206dde3a6bc3..da7102b1f7212bfef8c534b2158823c42db4ee96 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "lyric-engraver.hh"
@@ -11,44 +11,69 @@
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
+#include "paper-def.hh"
+#include "main.hh"
 
 Lyric_engraver::Lyric_engraver()
 {
+  lreq_l_ =0;
+  lyric_item_p_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request(Request*r)
+Lyric_engraver::do_try_request (Request*r)
 {
-    Musical_req * m =r->musical();
-    if (!m || ! m->lreq_l()) 
-       return false;
-    lreq_arr_.push(m->lreq_l());
+  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;
+  return true;
 }
 
 void
 Lyric_engraver::do_process_requests()
 {
-    Text_item * last_item_l =0;
-    for (int i=0; i < lreq_arr_.size(); i++) {
-       Text_item *lp = new Text_item(lreq_arr_[i]->tdef_p_ );
-       lp->dir_i_ = -1;
-       lp->fat_b_ = true;
-       if (last_item_l)
-           lp->add_support(last_item_l);
-       last_item_l = lp;
-       typeset_element(lp);
+  if (lreq_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;
+       }
+      
+      lyric_item_p_ =  new Text_item (td_p);
+
+      lyric_item_p_->dir_ = DOWN;
+      lyric_item_p_->fat_b_ = true;
+      announce_element (Score_element_info (lyric_item_p_, lreq_l_));
     }
 }
 
 void
 Lyric_engraver::do_post_move_processing()
 {
-    lreq_arr_.set_size(0);
+  lreq_l_ =0;
+}
+
+void
+Lyric_engraver::do_pre_move_processing()
+{
+  if (lyric_item_p_)
+    {
+      typeset_element (lyric_item_p_);
+      lyric_item_p_ =0;
+    }
 }
 
 
-IMPLEMENT_STATIC_NAME(Lyric_engraver);
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Request_engraver);
-ADD_THIS_ENGRAVER(Lyric_engraver);
+IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
+ADD_THIS_TRANSLATOR(Lyric_engraver);