X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=7f59d44430b7b433f17339c2fa2e70684e9848e4;hb=9f3572d98bb948c9689cd1f75401a029451fa001;hp=fc6b297a6e372b7c7b31cbb9a200f0a70cb99cd4;hpb=6b9bfd374643d1eed1ea158777d796c57a2bcd3a;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index fc6b297a6e..7f59d44430 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,37 +1,27 @@
 /*   
-  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*);
 };
 
@@ -39,11 +29,17 @@ protected:
 bool
 Output_property_engraver::try_music (Music* m)
 {
-  if (m->get_mus_property ("iterator-ctor") ==
-      Output_property_music_iterator::constructor_proc)
+  if (m->is_mus_type ("layout-instruction"))
     {
-      props_.push (m);
-      return true;
+      /*
+	UGH. Only swallow the output property event in the context
+	it was intended for. This is inelegant but not inefficient.
+      */
+      if (context ()->is_alias (m->get_property ("context-type")))
+        {
+          props_.push_back (m);
+          return true;
+        }
     }
   return false;
 }
@@ -51,22 +47,15 @@ Output_property_engraver::try_music (Music* m)
 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_->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_->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 ());
     }
 }
 
@@ -76,15 +65,24 @@ 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*/       "",
-/* accepts */     "general-music",
-/* 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 */
+		"");