X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=8e57ddf1d25e6b4b35de8aba0be60eb10f65608f;hb=d445cda01e4d86896f55fd1cf2ccbaba8cb7917a;hp=b20f3d7ca2bc0ed14fa39b2df47bef3e1e4eb750;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index b20f3d7ca2..8e57ddf1d2 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,67 +1,81 @@
 /*   
-  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 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
  */
 
-#include "output-property.hh"
 #include "engraver.hh"
-#include "score-element.hh"
+#include "grob.hh"
+#include "context.hh"
+
+#include "translator.icc"
+
 
 class Output_property_engraver : public Engraver
 {
-public:
-  VIRTUAL_COPY_CONS(Translator);
+  TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
-  
-  Link_array<Output_property> props_;
+  Link_array<Music> props_;
+  DECLARE_ACKNOWLEDGER (grob)
 
-  virtual void do_pre_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music*);
+  void stop_translation_timestep ();
+  virtual bool try_music (Music*);
 };
 
 
 bool
-Output_property_engraver::do_try_music (Music* m)
+Output_property_engraver::try_music (Music* m)
 {
-  if (Output_property * o = dynamic_cast<Output_property*> (m))
+  if (m->is_mus_type ("layout-instruction"))
     {
-      props_.push (o);
+      props_.push (m);
       return true;
     }
   return false;
 }
 
 void
-Output_property_engraver::acknowledge_element (Score_element_info inf)
+Output_property_engraver::acknowledge_grob (Grob_info inf)
 {
-  for (int i=props_.size (); i--; )
+  for (int i = props_.size (); i--;)
     {
-      Output_property * o = props_[i];
-      SCM pred = o->get_mus_property ("predicate");
-      
-      /*
-	should typecheck pred. 
-       */
-      SCM result=gh_apply (pred,
-			   gh_list (inf.elem_l_->self_scm (), SCM_UNDEFINED));
-      if (to_boolean (result))
-	{
-	  SCM sym = o->get_mus_property ("symbol");
-	  SCM val = o->get_mus_property ("value");
-	  inf.elem_l_->set_elt_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 ());
     }
 }
 
 void
-Output_property_engraver::do_pre_move_processing ()
+Output_property_engraver::stop_translation_timestep ()
 {
   props_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Output_property_engraver);
+Output_property_engraver::Output_property_engraver ()
+{
+}
+
+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 */
+		"");