-/*
-figured-bass-engraver.cc -- implement Figured_bass_engraver
+/*
+ figured-bass-engraver.cc -- implement Figured_bass_engraver
-source file of the GNU LilyPond music typesetter
+ source file of the GNU LilyPond music typesetter
-(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+ (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
#include "engraver.hh"
#include "text-item.hh"
-#include "event.hh"
#include "item.hh"
#include "context.hh"
TRANSLATOR_DECLARATIONS (Figured_bass_engraver);
protected:
Link_array<Music> figures_;
- Music * rest_req_;
+ Music *rest_req_;
+
+ Grob *figure_;
- Grob * figure_;
-
- virtual bool try_music (Music*);
+ virtual bool try_music (Music *);
virtual void stop_translation_timestep ();
virtual void process_music ();
};
-
Figured_bass_engraver::Figured_bass_engraver ()
{
figure_ = 0;
void
Figured_bass_engraver::stop_translation_timestep ()
{
- if (figure_)
- {
- typeset_grob (figure_);
- figure_ = 0;
- }
+ figure_ = 0;
figures_.clear ();
rest_req_ = 0;
}
bool
-Figured_bass_engraver::try_music (Music*m)
+Figured_bass_engraver::try_music (Music *m)
{
if (m->is_mus_type ("bass-figure-event"))
{
{
if (rest_req_)
{
- figure_ = make_item ("BassFigure");
- announce_grob (figure_, rest_req_->self_scm ()); // todo
- figure_->set_property ("text" , scm_makfrom0str ("-"));
+ figure_ = make_item ("BassFigure", rest_req_->self_scm ());
+ figure_->set_property ("text", scm_makfrom0str ("-"));
}
else if (figures_.size ())
{
SCM proc = get_property ("bassFigureFormatFunction");
- if (ly_c_procedure_p (proc))
+ if (ly_c_procedure_p (proc))
{
SCM l = SCM_EOL;
- SCM * t = &l;
+ SCM *t = &l;
for (int i = 0; i < figures_.size (); i++)
{
*t = scm_cons (figures_[i]->self_scm (), SCM_EOL);
t = SCM_CDRLOC (*t);
}
- figure_ = make_item ("BassFigure");
+ figure_ = make_item ("BassFigure", figures_[0]->self_scm ());
scm_call_3 (proc, l, context ()->self_scm (),
figure_->self_scm ());
- announce_grob (figure_, figures_[0]->self_scm ()); // todo
}
}
}
-
-ENTER_DESCRIPTION (Figured_bass_engraver,
-/* descr */ "Make figured bass numbers.",
-/* creats*/ "BassFigure",
-/* accepts */ "rest-event bass-figure-event",
-/* acks */ "",
-/* reads */ "bassFigureFormatFunction",
-/* write */ "");
+ADD_TRANSLATOR (Figured_bass_engraver,
+ /* descr */ "Make figured bass numbers.",
+ /* creats*/ "BassFigure",
+ /* accepts */ "rest-event bass-figure-event",
+ /* acks */ "",
+ /* reads */ "bassFigureFormatFunction",
+ /* write */ "");