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 "g-text-item.hh"
+#include "item.hh"
#include "paper-def.hh"
-#include "lookup.hh"
+#include "font-metric.hh"
+#include "side-position-interface.hh"
ADD_THIS_TRANSLATOR (Lyric_engraver);
Lyric_engraver::Lyric_engraver()
{
+ text_p_ =0;
+ req_l_ =0;
}
bool
{
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;
}
void
-Lyric_engraver::do_process_requests()
+Lyric_engraver::do_process_music()
{
- 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 Item (get_property ("LyricText"));
+
+ text_p_->set_elt_property ("text", req_l_->get_mus_property ("text"));
+
+ /*
+ We can't reach the notehead where we're centered from here. So
+ we kludge.
- Scalar style = get_property ("textstyle", 0);
- if (style.length_i ())
- item_p->style_str_ = style;
- if (i)
- {
- Real dy = paper ()->lookup_l (0)-> text
- (item_p->style_str_, String ("Cg")).dim_. y ().length ();
- dy *= 1.1;
- item_p->translate_axis (-i * dy, Y_AXIS);
- }
+ (UGH UGH, pulled amount of space out of thin air)
+ */
- text_p_arr_.push (item_p);
- announce_element (Score_element_info (item_p, request_l));
+ text_p_->translate_axis (0.66, X_AXIS);
+
+ announce_element (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;
+}
+
+