source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
/*
-TODO: detect the top staff (staffsFound), and acknowledge staff-group
+TODO: detect the top staff (stavesFound), and acknowledge staff-group
system-start-delims. If we find these, and the top staff is in the
staff-group, add padding to the bar number.
class Bar_number_engraver : public Engraver
{
protected:
- Item* text_p_;
+ Item* text_;
protected:
virtual void stop_translation_timestep ();
virtual void acknowledge_grob (Grob_info);
virtual void process_music ();
void create_items ();
- TRANSLATOR_DECLARATIONS( Bar_number_engraver );
+ TRANSLATOR_DECLARATIONS(Bar_number_engraver );
};
-/*
- TODO: more advanced formatting via SCM function, perhaps barnumbers
- every 5 measures? */
-
void
Bar_number_engraver::process_music ()
{
if (gh_string_p (wb))
{
- SCM bn = get_property ("currentBarNumber");
SCM smp = get_property ("measurePosition");
- int ibn = gh_number_p (bn) ? gh_scm2int(bn) : 1;
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
- if (mp.main_part_ == Rational (0)
- && ibn != 1)
+ if (mp.main_part_ == Rational (0))
{
- create_items ();
-
- // guh.
- text_p_->set_grob_property ("text",
- ly_str02scm (to_str (gh_scm2int (bn)).ch_C ()));
+ SCM bn = get_property ("currentBarNumber");
+ SCM proc = get_property ("barNumberVisibility");
+ if (gh_number_p (bn) && gh_procedure_p (proc)
+ && to_boolean(gh_call1(proc, bn)))
+ {
+ create_items ();
+ // guh.
+ text_->set_grob_property
+ ("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
+ }
}
}
Bar_number_engraver::Bar_number_engraver ()
{
- text_p_ =0;
+ text_ =0;
}
void
Bar_number_engraver::acknowledge_grob (Grob_info inf)
{
- Grob * s = inf.grob_l_;
- if (text_p_
+ Grob * s = inf.grob_;
+ if (text_
&& dynamic_cast<Item*> (s)
&& s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
{
/*
By default this would land on the Paper_column -- so why
doesn't it work when you leave this out? */
- text_p_->set_parent (s, X_AXIS);
+ text_->set_parent (s, X_AXIS);
}
}
void
Bar_number_engraver::stop_translation_timestep ()
{
- if (text_p_)
+ if (text_)
{
- text_p_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
- typeset_grob (text_p_);
- text_p_ =0;
+ text_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
+ typeset_grob (text_);
+ text_ =0;
}
}
void
Bar_number_engraver::create_items ()
{
- if (text_p_)
+ if (text_)
return;
- SCM b = get_property ("BarNumber");
- text_p_ = new Item (b);
- Side_position_interface::set_axis (text_p_,Y_AXIS);
+ text_ = make_item ("BarNumber");
+ Side_position_interface::set_axis (text_,Y_AXIS);
- announce_grob(text_p_, SCM_EOL);
+ announce_grob(text_, SCM_EOL);
}
ENTER_DESCRIPTION(Bar_number_engraver,
-/* descr */ "A bar number is created whenever measurePosition is zero. It is
-put on top of all staves, and appears only at left side of the staff.",
+/* descr */ "A bar number is created whenever measurePosition is zero. It is\n"
+"put on top of all staves, and appears only at left side of the staff.",
/* creats*/ "BarNumber",
-/* acks */ "break-aligned-interface",
-/* reads */ "currentBarNumber stavesFound" ,
+/* accepts */ "",
+/* acks */ "break-aligned-interface",
+/* reads */ "currentBarNumber stavesFound barNumberVisibility" ,
/* write */ "");