source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
-#include "lily-guile.hh"
#include "paper-column.hh"
-#include "paper-def.hh"
+#include "output-def.hh"
#include "side-position-interface.hh"
-#include "item.hh"
-#include "moment.hh"
#include "engraver.hh"
-#include "translator-group.hh"
+#include "context.hh"
/*
virtual void acknowledge_grob (Grob_info);
virtual void process_music ();
void create_items ();
- TRANSLATOR_DECLARATIONS( Bar_number_engraver );
+ TRANSLATOR_DECLARATIONS (Bar_number_engraver );
};
SCM wb = get_property ("whichBar");
- if (gh_string_p (wb))
+ if (scm_is_string (wb))
{
- SCM smp = get_property ("measurePosition");
-
- Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
+ Moment mp (robust_scm2moment (get_property ("measurePosition"), Moment (0)));
if (mp.main_part_ == Rational (0))
{
SCM bn = get_property ("currentBarNumber");
SCM proc = get_property ("barNumberVisibility");
- if (gh_number_p (bn) && to_boolean(gh_call1(proc, bn)))
+ if (scm_is_number (bn) && ly_c_procedure_p (proc)
+ && to_boolean (scm_call_1(proc, bn)))
{
create_items ();
// guh.
- text_->set_grob_property
- ("text", scm_makfrom0str (to_string (gh_scm2int (bn)).to_str0 ()));
+ text_->set_property
+ ("text", scm_makfrom0str (to_string (scm_to_int (bn)).to_str0 ()));
}
}
}
Bar_number_engraver::Bar_number_engraver ()
{
- text_ =0;
+ text_ = 0;
}
Grob * s = inf.grob_;
if (text_
&& dynamic_cast<Item*> (s)
- && s->get_grob_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
+ && s->get_property ("break-align-symbol") == ly_symbol2scm ("left-edge"))
{
/*
By default this would land on the Paper_column -- so why
{
if (text_)
{
- text_->set_grob_property ("side-support-elements", get_property ("stavesFound"));
- typeset_grob (text_);
- text_ =0;
+ text_->set_property ("side-support-elements", get_property ("stavesFound"));
+
+ text_ = 0;
}
}
if (text_)
return;
- SCM b = get_property ("BarNumber");
- text_ = new Item (b);
- Side_position_interface::set_axis (text_,Y_AXIS);
-
- announce_grob(text_, SCM_EOL);
+ text_ = make_item ("BarNumber", SCM_EOL);
+ Side_position_interface::set_axis (text_, Y_AXIS);
}
-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.",
+ADD_TRANSLATOR (Bar_number_engraver,
+/* 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. "
+ "The staves are taken from @code{stavesFound}, which is maintained by "
+ "@code{@ref{Staff_collecting_engraver}}. "
+ ,
+
/* creats*/ "BarNumber",
/* accepts */ "",
/* acks */ "break-aligned-interface",