source file of the GNU LilyPond music typesetter
- (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
-#include "spanner.hh"
#include "pointer-group-interface.hh"
#include "side-position-interface.hh"
#include "axis-group-interface.hh"
SCM long_text_;
SCM short_text_;
- vector<Grob*> axis_groups_;
+ vector<Grob *> axis_groups_;
virtual void finalize ();
DECLARE_ACKNOWLEDGER (axis_group);
long_text = get_property ("vocalName");
short_text = get_property ("shortVocalName");
}
-
+
if ((Text_interface::is_markup (long_text)
|| Text_interface::is_markup (short_text))
&& (!text_spanner_
if (text_spanner_)
stop_spanner ();
-
short_text_ = short_text;
long_text_ = long_text;
Instrument_name_engraver::start_spanner ()
{
text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
-
+
Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
text_spanner_->set_bound (LEFT, col);
text_spanner_->set_property ("text", short_text_);
if (system)
Axis_group_interface::add_element (system, text_spanner_);
else
- text_spanner_->programming_error ("can't find root system");
+ text_spanner_->programming_error ("cannot find root system");
}
-
void
Instrument_name_engraver::acknowledge_axis_group (Grob_info info)
{
Instrument_name_engraver::finalize ()
{
if (text_spanner_)
- {
- stop_spanner ();
- }
+ stop_spanner ();
}
void
Instrument_name_engraver::stop_spanner ()
{
for (vsize i = 0; i < axis_groups_.size (); i++)
- Pointer_group_interface::add_grob (text_spanner_, ly_symbol2scm ("elements"), axis_groups_[i]);
+ Pointer_group_interface::add_grob (text_spanner_,
+ ly_symbol2scm ("elements"),
+ axis_groups_[i]);
text_spanner_->set_bound (RIGHT,
unsmob_grob (get_property ("currentCommandColumn")));
- Pointer_group_interface::set_ordered (text_spanner_, ly_symbol2scm ("elements"), false);
+ Pointer_group_interface::set_ordered (text_spanner_,
+ ly_symbol2scm ("elements"),
+ false);
text_spanner_ = 0;
}
-#include "translator.icc"
ADD_ACKNOWLEDGER (Instrument_name_engraver, axis_group);
ADD_TRANSLATOR (Instrument_name_engraver,
-
/* doc */
- "Creates a system start text for instrument or vocal names.",
+ "Create a system start text for instrument or vocal names.",
/* create */
"InstrumentName ",
"shortInstrumentName "
"instrumentName "
"shortVocalName "
- "vocalName "
- ,
+ "vocalName ",
- /* write */ "");
+ /* write */
+ ""
+ );