source file of the GNU LilyPond music typesetter
- (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
-#include "item.hh"
#include "bar-line.hh"
#include "system-start-delimiter.hh"
#include "side-position-interface.hh"
{
public:
- TRANSLATOR_DECLARATIONS(Instrument_name_engraver);
+ TRANSLATOR_DECLARATIONS (Instrument_name_engraver);
protected:
Grob *text_;
text_ = 0;
}
-
void
Instrument_name_engraver::initialize ()
{
- daddy_context_->set_property ("instrumentSupport", SCM_EOL);
+ context ()->set_property ("instrumentSupport", SCM_EOL);
}
void
if (text_)
{
text_->set_property ("side-support-elements",
- get_property ("instrumentSupport"));
- typeset_grob (text_);
+ get_property ("instrumentSupport"));
text_ = 0;
}
}
-
void
Instrument_name_engraver::create_text ()
{
return ;
- text_ = make_item ("InstrumentName");
+ text_ = make_item ("InstrumentName", SCM_EOL);
if (text_->get_property ("text") != txt)
text_->set_property ("text", txt);
- announce_grob (text_, SCM_EOL);
- }
+
+}
void
Instrument_name_engraver::acknowledge_grob (Grob_info i)
{
if (Bar_line::has_interface (i.grob_))
{
- create_text();
+ create_text ();
}
+ /*
+ Ugh - typechecking for pedal and dynamic sucks.
+ */
if (dynamic_cast<Spanner*> (i.grob_)
- && i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface")))
+ && (i.grob_->internal_has_interface (ly_symbol2scm ("dynamic-interface"))
+ || i.grob_->internal_has_interface (ly_symbol2scm ("piano-pedal-interface")))
+ )
return;
/*
&& Axis_group_interface::has_axis (i.grob_, Y_AXIS)))
&& !Align_interface::has_interface (i.grob_))
{
- SCM nl = gh_cons (i.grob_->self_scm (),
+ SCM nl = scm_cons (i.grob_->self_scm (),
get_property ("instrumentSupport"));
- daddy_context_->set_property ("instrumentSupport", nl);
+ context ()->set_property ("instrumentSupport", nl);
}
}
Also create text if barlines in other groups. This allows
a name to be attached to lyrics or chords.
*/
- if (gh_string_p (get_property ("whichBar")))
- create_text();
+ if (scm_is_string (get_property ("whichBar")))
+ create_text ();
}
-ENTER_DESCRIPTION(Instrument_name_engraver,
+ADD_TRANSLATOR (Instrument_name_engraver,
/* descr */ " Prints the name of the instrument (specified by "
" @code{Staff.instrument} and @code{Staff.instr}) "
"at the left of the staff. ",
class Vocal_name_engraver : public Instrument_name_engraver
{
public:
- TRANSLATOR_DECLARATIONS(Vocal_name_engraver);
+ TRANSLATOR_DECLARATIONS (Vocal_name_engraver);
virtual void create_text ();
};
if (txt == SCM_EOL)
return ;
- text_ = make_item ("VocalName");
+ text_ = make_item ("VocalName", SCM_EOL);
if (text_->get_property ("text") != txt)
text_->set_property ("text", txt);
- announce_grob (text_, SCM_EOL);
+
}
-ENTER_DESCRIPTION(Vocal_name_engraver,
+ADD_TRANSLATOR (Vocal_name_engraver,
/* descr */ " Prints the name of the a lyric voice (specified by "
" @code{Staff.vocalName} and @code{Staff.vocNam}) "
"at the left of the staff. ",