X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=d7f075d32196eb2a502fd4fc4410040b81465223;hb=0b333486fdb269350815b00bb8f16659fdc9079a;hp=527b0c103a98d96e777369efb184b208615329af;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 527b0c103a..d7f075d321 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,72 +1,56 @@
 /*   
-  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--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
  */
 
 #include "engraver.hh"
+#include "context.hh"
 #include "grob.hh"
-#include "output-property-music-iterator.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
 
 class Output_property_engraver : public Engraver
 {
-TRANSLATOR_DECLARATIONS(Output_property_engraver);
+  TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
-
-  /*
-    should do this with \once and \push ?
-
-
-      \property Voice.outputProperties \push #pred = #modifier
-
-      where both MODIFIER and PRED are functions taking a
-      grob.
-      
-   */
-
+  vector<Stream_event*> props_;
   
-  Link_array<Music> props_;
+  DECLARE_ACKNOWLEDGER (grob);
+  DECLARE_TRANSLATOR_LISTENER (apply_output);
 
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
-  virtual bool try_music (Music*);
+  void stop_translation_timestep ();
 };
 
-
-bool
-Output_property_engraver::try_music (Music* m)
+IMPLEMENT_TRANSLATOR_LISTENER (Output_property_engraver, apply_output);
+void
+Output_property_engraver::listen_apply_output (Stream_event *ev)
 {
-  if (m->get_mus_property ("iterator-ctor") ==
-      Output_property_music_iterator::constructor_cxx_function)
-    {
-      props_.push (m);
-      return true;
-    }
-  return false;
+  /*
+    UGH. Only swallow the output property event in the context
+    it was intended for. This is inelegant but not inefficient.
+  */
+  if (context ()->is_alias (ev->get_property ("context-type")))
+    props_.push_back (ev);
 }
 
 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_->set_grob_property (sym, val);
-	}
+      Stream_event *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 ());
     }
 }
 
@@ -76,14 +60,21 @@ Output_property_engraver::stop_translation_timestep ()
   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 */
+		"",
+		
+		/* read */
+		"",
+		
+		/* write */
+		""
+		);