source file of the GNU LilyPond music typesetter
- (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "engraver.hh"
#include "grob.hh"
-#include "output-property-music-iterator.hh"
-#include "translator-group.hh"
+#include "context.hh"
class Output_property_engraver : public Engraver
{
-TRANSLATOR_DECLARATIONS(Output_property_engraver);
+TRANSLATOR_DECLARATIONS (Output_property_engraver);
protected:
Link_array<Music> props_;
void
Output_property_engraver::acknowledge_grob (Grob_info inf)
{
- for (int i=props_.size (); i--;)
+ for (int i = props_.size (); i--;)
{
Music * o = props_[i];
- SCM pred = o->get_mus_property ("predicate");
+ SCM pred = o->get_property ("predicate");
- if (gh_procedure_p (pred))
+ if (ly_c_procedure_p (pred))
{
/*
should typecheck pred.
*/
- SCM result=scm_call_1 (pred, inf.grob_->self_scm ());
+ SCM result = scm_call_1 (pred, inf.grob_->self_scm ());
if (to_boolean (result))
{
- SCM sym = o->get_mus_property ("grob-property");
- SCM val = o->get_mus_property ("grob-value");
- inf.grob_->internal_set_grob_property (sym, val);
+ SCM sym = o->get_property ("grob-property");
+ SCM val = o->get_property ("grob-value");
+ inf.grob_->internal_set_property (sym, val);
}
}
else
{
- Translator_group * d =
- dynamic_cast<Translator_group*> (inf.origin_trans_);
+ Context * d =
+ dynamic_cast<Context *> (inf.origin_trans_);
if (!d)
- d = dynamic_cast<Translator_group*> (inf.origin_trans_->daddy_trans_);
+ d = dynamic_cast<Context *> (inf.origin_trans_->context ());
- SCM proc = o->get_mus_property ("procedure");
+ SCM proc = o->get_property ("procedure");
scm_call_3 (proc,
- inf.grob_->self_scm(),
- d->self_scm(),
- daddy_trans_->self_scm());
+ inf.grob_->self_scm (),
+ d->self_scm (),
+ context ()->self_scm ());
}
}
}
props_.clear ();
}
-Output_property_engraver::Output_property_engraver()
+Output_property_engraver::Output_property_engraver ()
{
}
-ENTER_DESCRIPTION(Output_property_engraver,
+ADD_TRANSLATOR (Output_property_engraver,
/* descr */ "Interpret Music of Output_property type, and apply a function "
" to any Graphic objects that satisfies the predicate.",
/* creats*/ "",