release: 1.1.43

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index c5447ad97ed05200baea881cc766d9d06e0baadf..d93c7b48d9f067106d5abaf41b30f7af05498921 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -3,46 +3,23 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 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 "g-text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
-#include "dimensions.hh"
-#include "g-text-item.hh"
-
-
-#include "engraver.hh"
-#include "array.hh"
-#include "lily-proto.hh"
-
-class Lyric_engraver : public Engraver 
-{
-protected:
-  virtual void do_pre_move_processing();
-  virtual bool do_try_music (Music*);
-  virtual void do_process_requests();
-
-public:
-  Lyric_engraver();
-  VIRTUAL_COPY_CONS(Translator);
 
-private:
-  Link_array<Lyric_req> lyric_req_l_arr_;
-  Link_array<Item> text_p_arr_;
-};
-
-
-ADD_THIS_TRANSLATOR(Lyric_engraver);
+ADD_THIS_TRANSLATOR (Lyric_engraver);
 
 
 Lyric_engraver::Lyric_engraver()
 {
+  text_p_ =0;
+  req_l_ =0;
 }
 
 bool
@@ -50,7 +27,9 @@ 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;
@@ -59,32 +38,34 @@ Lyric_engraver::do_try_music (Music*r)
 void
 Lyric_engraver::do_process_requests()
 {
-  if (text_p_arr_.size ())
-    return;
-
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (req_l_)
     {
-      Lyric_req* request_l = lyric_req_l_arr_[i];
-      G_text_item* item_p =  new G_text_item;
-      item_p->text_str_ = request_l->text_str_;
+      text_p_=  new G_text_item;
+      text_p_->text_str_ = req_l_->text_str_;
+
+      text_p_->text_str_ += " ";       // ugh.
 
-      Scalar style = get_property ("textstyle", 0);
+      Scalar style = get_property ("textStyle", 0);
       if (style.length_i ())
-       item_p->style_str_ = style;
+       text_p_->style_str_ = style;
       
-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_l));
+      announce_element (Score_element_info (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;
 }