X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=12a19539b47f6bde32c8e3b9c52cd49e914d5d5a;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6e1f44a10233e76ed13dfd67cb829ca67fbaa751;hpb=811be522d0b79493159f47789e5621dc85493495;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 6e1f44a102..12a19539b4 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,67 +3,54 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
  */
 
 #include "engraver.hh"
-#include "grob.hh"
 #include "context.hh"
+#include "grob.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
 
 class Output_property_engraver : public Engraver
 {
   TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
-  Link_array<Music> props_;
-  DECLARE_ACKNOWLEDGER (grob)
+  vector<Stream_event*> props_;
+  
+  DECLARE_ACKNOWLEDGER (grob);
+  DECLARE_TRANSLATOR_LISTENER (apply_output);
 
   void stop_translation_timestep ();
-  virtual bool try_music (Music*);
 };
 
-
-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->is_mus_type ("layout-instruction"))
-    {
-      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_property ("predicate");
-
-      if (ly_is_procedure (pred))
-	{
-	  /*
-	    should typecheck pred. 
-	  */
-	  SCM result = scm_call_1 (pred, inf.grob ()->self_scm ());
-	  if (to_boolean (result))
-	    {
-	      SCM sym = o->get_property ("grob-property");
-	      SCM val = o->get_property ("grob-value");
-	      inf.grob ()->internal_set_property (sym, val);
-	    }
-	}
-      else
-	{
-	  Context * d = inf.context ();
-	  SCM proc = o->get_property ("procedure");
-	  scm_call_3 (proc,
-		      inf.grob ()->self_scm (),
-		      d->self_scm (), 
-		      context ()->self_scm ());
-	}
+      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 ());
     }
 }
 
@@ -77,12 +64,17 @@ Output_property_engraver::Output_property_engraver ()
 {
 }
 
-#include "translator.icc"
-ADD_ACKNOWLEDGER (Output_property_engraver,grob)
+ADD_ACKNOWLEDGER (Output_property_engraver, grob);
 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*/       "",
-/* accepts */     "layout-instruction",
-/* reads */       "",
-/* write */       "");
+		/* doc */
+		"Apply a procedure to any grob acknowledged.",
+		
+		/* create */
+		"",
+		
+		/* read */
+		"",
+		
+		/* write */
+		""
+		);