source file of the GNU LilyPond music typesetter
- (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
class Instrument_name_engraver : public Engraver
{
Item *text_;
- Score_element * delim_ ;
+ Grob * delim_ ;
void create_text (SCM s);
public:
VIRTUAL_COPY_CONS(Translator);
Instrument_name_engraver ();
- virtual void acknowledge_element (Score_element_info);
- virtual void do_pre_move_processing ();
+ virtual void acknowledge_grob (Grob_info);
+ virtual void stop_translation_timestep ();
};
ADD_THIS_TRANSLATOR(Instrument_name_engraver);
void
-Instrument_name_engraver::do_pre_move_processing ()
+Instrument_name_engraver::stop_translation_timestep ()
{
if (text_)
{
- typeset_element (text_);
+ typeset_grob (text_);
text_ = 0;
}
}
if(!text_)
{
text_ = new Item (get_property ("InstrumentName"));
- text_->set_elt_property ("text", txt);
-
+
+ if (text_->get_grob_property ("text") != txt)
+ text_->set_grob_property ("text", txt);
+
if (delim_)
- text_->set_parent (delim_, Y_AXIS);
-
- announce_element (text_,0);
+ text_->set_parent (delim_, Y_AXIS);
+
+ announce_grob (text_,0);
}
}
void
-Instrument_name_engraver::acknowledge_element (Score_element_info i)
+Instrument_name_engraver::acknowledge_grob (Grob_info i)
{
- SCM s = get_property ("instrument");
-
- if (now_mom () > Moment (0))
- s = get_property ("instr");
-
- if (gh_string_p (s))
+ if (Bar::has_interface (i.elem_l_))
{
- if (Bar::has_interface (i.elem_l_))
- {
- create_text (s);
- }
+ SCM s = get_property ("instrument");
+
+ if (now_mom () > Moment (0))
+ s = get_property ("instr");
+
+ /*
+ FIXME: use markup_p () to check type.
+ */
+ if (gh_string_p (s) || gh_pair_p (s))
+ create_text (s);
+
}
if (Align_interface::has_interface (i.elem_l_)