X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=d7f075d32196eb2a502fd4fc4410040b81465223;hb=a8bf97b6b7f724102ecef1d220c71f090bc45657;hp=c2afe2fbe2e7c2f5e1d85a6e8a9b8f7ea8b73860;hpb=4ab6bfab34d4ae05980015a2bc2eb55fb8607b74;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index c2afe2fbe2..d7f075d321 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,76 +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--2003 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 "translator-group.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:
-  Link_array<Music> props_;
+  vector<Stream_event*> 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->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_mus_property ("predicate");
-
-
-
-      if (gh_procedure_p (pred))
-	{
-	  /*
-	    should typecheck pred. 
-	  */
-	  SCM result=scm_call_1 (pred, inf.grob_->self_scm ());
-	  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);
-	    }
-	}
-      else
-	{
-	  Translator_group * d =
-	    dynamic_cast<Translator_group*> (inf.origin_trans_);
-
-	  if (!d)
-	    d = dynamic_cast<Translator_group*> (inf.origin_trans_->daddy_trans_);
-	  
-	  SCM proc = o->get_mus_property ("procedure");
-	  scm_call_3 (proc,
-		      inf.grob_->self_scm(),
-		      d->self_scm(), 
-		      daddy_trans_->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 ());
     }
 }
 
@@ -80,15 +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*/       "",
-/* accepts */     "layout-instruction",
-/* 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 */
+		""
+		);