+/*
+figured-bass-engraver.cc -- implement Figured_bass_engraver
+
+source file of the GNU LilyPond music typesetter
+
+(c) 2002--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+
+ */
+
#include "engraver.hh"
#include "text-item.hh"
-#include "musical-request.hh"
+#include "event.hh"
#include "item.hh"
+#include "translator-group.hh"
class Figured_bass_engraver : public Engraver
{
-
TRANSLATOR_DECLARATIONS(Figured_bass_engraver);
protected:
- Link_array<Note_req> figures_;
- Rest_req * rest_req_;
+ Link_array<Music> figures_;
+ Music * rest_req_;
Grob * figure_;
if (figure_)
{
typeset_grob (figure_);
- figure_ =00;
+ figure_ = 0;
}
figures_.clear ();
+ rest_req_ = 0;
}
bool
Figured_bass_engraver::try_music (Music*m)
{
- if (Note_req* n = dynamic_cast<Note_req*> (m))
+ if (m->is_mus_type ("bass-figure-event"))
{
- figures_.push (n);
+ figures_.push (m);
return true;
}
- else if (Rest_req * r = dynamic_cast<Rest_req*> (m))
+ else if (m->is_mus_type ("rest-event"))
{
- rest_req_ = r;
+ rest_req_ = m;
return true;
}
return false;
if (rest_req_)
{
figure_ = new Item (get_property ("BassFigure"));
- announce_grob (figure_, rest_req_); // todo
- figure_->set_grob_property ("text" , gh_str02scm ("-"));
+ announce_grob(figure_, rest_req_->self_scm()); // todo
+ figure_->set_grob_property ("text" , scm_makfrom0str ("-"));
}
else if (figures_.size ())
{
- figure_ = new Item (get_property ("BassFigure"));
- announce_grob (figure_, figures_[0]); // todo
- SCM flist = SCM_EOL;
- for (int i = 0; i < figures_.size (); i++)
+ SCM proc = get_property ("bassFigureFormatFunction");
+ if (gh_procedure_p (proc))
{
- Note_req * n = figures_[i];
- Pitch *p = unsmob_pitch (n->get_mus_property ("pitch"));
-
- String fstr = to_str (p->steps ()+ 1);
-
- SCM one_fig = ly_str02scm(fstr.ch_C ());
-
- if (p->alteration_i_ || to_boolean (n->get_mus_property ("force-accidental") ))
- {
- SCM alter = scm_assoc (gh_int2scm (p->alteration_i_),
- figure_->get_grob_property ("accidental-alist"));
- if (gh_pair_p (alter))
- {
- one_fig = scm_list_n (ly_symbol2scm ("columns"),
- one_fig,
- ly_cdr(alter),
- SCM_UNDEFINED);
- }
- }
-
- flist = gh_cons (one_fig, flist);
- }
+ SCM l = SCM_EOL;
- flist = gh_cons (ly_symbol2scm ("lines"), flist);
+ for (int i = 0; i <figures_.size (); i++)
+ l = gh_cons (figures_[i]->self_scm(), l);
- figure_-> set_grob_property ("text", flist);
+ SCM markup = scm_call_2 (proc, l, daddy_trans_->self_scm ());
+
+ figure_ = new Item (get_property ("BassFigure"));
+ figure_->set_grob_property ("text", markup);
+ announce_grob(figure_, figures_[0]->self_scm()); // todo
+ }
}
}
ENTER_DESCRIPTION(Figured_bass_engraver,
-/* descr */ "Make volta brackets",
+/* descr */ "Make figured bass numbers.",
/* creats*/ "BassFigure",
-/* acks */ "",
-/* reads */ "",
+/* accepts */ "rest-event bass-figure-event",
+/* acks */ "",
+/* reads */ "bassFigureFormatFunction",
/* write */ "");