/*
- output-property-engraver.cc -- implement Output_property_engraver
+ output-property-engraver.cc -- implement Output_property_engraver
source file of the GNU LilyPond music typesetter
- (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "engraver.hh"
#include "grob.hh"
-#include "output-property-music-iterator.hh"
+#include "context.hh"
+
+#include "translator.icc"
+
class Output_property_engraver : public Engraver
{
-TRANSLATOR_DECLARATIONS(Output_property_engraver);
+ TRANSLATOR_DECLARATIONS (Output_property_engraver);
protected:
+ vector<Music*> props_;
+ DECLARE_ACKNOWLEDGER (grob)
- /*
- should do this with \once and \push ?
-
-
- \property Voice.outputProperties \push #pred = #modifier
-
- where both MODIFIER and PRED are functions taking a
- grob.
-
- */
-
-
- Link_array<Music> props_;
-
- virtual void stop_translation_timestep ();
- virtual void acknowledge_grob (Grob_info);
+ void stop_translation_timestep ();
virtual bool try_music (Music*);
};
bool
Output_property_engraver::try_music (Music* m)
{
- if (m->get_mus_property ("iterator-ctor") ==
- Output_property_music_iterator::constructor_cxx_function)
+ if (m->is_mus_type ("layout-instruction"))
{
- props_.push (m);
+ props_.push_back (m);
return true;
}
return false;
void
Output_property_engraver::acknowledge_grob (Grob_info inf)
{
- for (int i=props_.size (); i--;)
+ for (vsize i = props_.size (); i--;)
{
- Music * o = props_[i];
- SCM pred = o->get_mus_property ("predicate");
-
- /*
- should typecheck pred.
- */
- SCM result=gh_apply (pred,
- scm_list_n (inf.grob_l_->self_scm (), SCM_UNDEFINED));
- if (to_boolean (result))
- {
- SCM sym = o->get_mus_property ("grob-property");
- SCM val = o->get_mus_property ("grob-value");
- inf.grob_l_->internal_set_grob_property (sym, val);
- }
+ Music *o = props_[i];
+ Context *d = inf.context ();
+ SCM proc = o->get_property ("procedure");
+ scm_call_3 (proc,
+ 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,
-/* descr */ "Interpret Music of Output_property type, and apply a function
-to any Graphic objects that satisfies the predicate.",
-/* creats*/ "",
-/* acks */ "grob-interface",
-/* reads */ "",
-/* write */ "");
+ADD_ACKNOWLEDGER (Output_property_engraver,grob);
+ADD_TRANSLATOR (Output_property_engraver,
+
+ /* doc */
+ "Apply a procedure to any grob acknowledged. ",
+
+ /* create */
+ "",
+
+ /* accept */
+ "layout-instruction",
+
+ /* read */
+ "",
+
+ /* write */
+ "");