release: 1.1.15

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index ceba7c467e16cbc683b119e006a322e5072c83ab..9fb403f2da0d2c264553e05c6f687017515f0bf5 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -4,6 +4,7 @@
   source file of the GNU LilyPond music typesetter
 
   (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "lyric-engraver.hh"
@@ -13,67 +14,65 @@
 #include "lookup.hh"
 #include "paper-def.hh"
 #include "main.hh"
+#include "dimensions.hh"
+
+ADD_THIS_TRANSLATOR(Lyric_engraver);
 
 Lyric_engraver::Lyric_engraver()
 {
-  lreq_l_ =0;
-  lyric_item_p_ =0;
 }
 
 bool
-Lyric_engraver::do_try_request (Request*r)
+Lyric_engraver::do_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 (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
+    {
+      lyric_req_l_arr_.push (l);
+      return true;
+    }
+  return false;
 }
 
 void
 Lyric_engraver::do_process_requests()
 {
-  if (lreq_l_) 
+  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++)
     {
-      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");
+      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 ())
-       {
-         td_p->style_str_ = style;
-       }
-      Scalar alignment = get_property ("textalignment");
+       text_p->style_str_ = style;
       if (alignment.isnum_b())
-       {
-         td_p->align_dir_= (Direction)(int)alignment;
-       }
+       text_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_));
+      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));
     }
 }
 
-void
-Lyric_engraver::do_post_move_processing()
-{
-  lreq_l_ =0;
-}
-
 void
 Lyric_engraver::do_pre_move_processing()
 {
-  if (lyric_item_p_)
+  for (int i=0; i < text_p_arr_.size (); i++)
     {
-      typeset_element (lyric_item_p_);
-      lyric_item_p_ =0;
+      typeset_element (text_p_arr_[i]);
     }
+  text_p_arr_.clear ();
+  lyric_req_l_arr_.clear ();
 }
 
-
-IMPLEMENT_IS_TYPE_B1(Lyric_engraver,Engraver);
-ADD_THIS_TRANSLATOR(Lyric_engraver);