release: 1.3.0

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

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index bac629b38578ea4fb4b76bb4551a6aacc30aa9f1..080546f2f5fe6524e18e880304043fb607b9f1b1 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -12,14 +12,14 @@
 #include "text-item.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
-#include "paper-def.hh"
-#include "main.hh"
-#include "dimensions.hh"
 
-ADD_THIS_TRANSLATOR(Lyric_engraver);
+ADD_THIS_TRANSLATOR (Lyric_engraver);
+
 
 Lyric_engraver::Lyric_engraver()
 {
+  text_p_ =0;
+  req_l_ =0;
 }
 
 bool
@@ -27,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;
@@ -36,48 +38,35 @@ Lyric_engraver::do_try_music (Music*r)
 void
 Lyric_engraver::do_process_requests()
 {
-  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 Text_item;
+      text_p_->text_str_ = req_l_->text_str_;
+      text_p_->text_str_ += " ";       // ugh.
+
+      SCM style = get_property ("textStyle", 0);
+      if (gh_string_p(style))
+       text_p_->style_str_ = ly_scm2string (style);
+
+      text_p_->set_elt_property (non_rhythmic_scm_sym, SCM_BOOL_T);
       
-      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));
+      announce_element (Score_element_info (text_p_, req_l_));
     }
 }
 
 void
-Lyric_engraver::do_post_move_processing()
+Lyric_engraver::do_pre_move_processing()
 {
+  if (text_p_)
+    {
+      typeset_element (text_p_);
+      text_p_ =0;
+    }
 }
 
 void
-Lyric_engraver::do_pre_move_processing()
+Lyric_engraver::do_post_move_processing ()
 {
-  for (int i=0; i < text_p_arr_.size (); i++)
-    {
-      typeset_element (text_p_arr_[i]);
-    }
-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
+  req_l_ =0;
 }