Run `make grand-replace'.

[lilypond.git] / lily / output-property-engraver.cc

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index c0750c06c858fb20507e010f03d11256f3cadedf..12a19539b47f6bde32c8e3b9c52cd49e914d5d5a 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,13 +3,14 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.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"
 
@@ -18,23 +19,24 @@ 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_back (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
@@ -42,7 +44,7 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
 {
   for (vsize i = props_.size (); i--;)
     {
-      Music *o = props_[i];
+      Stream_event *o = props_[i];
       Context *d = inf.context ();
       SCM proc = o->get_property ("procedure");
       scm_call_3 (proc,
@@ -62,20 +64,17 @@ Output_property_engraver::Output_property_engraver ()
 {
 }
 
-ADD_ACKNOWLEDGER (Output_property_engraver,grob);
+ADD_ACKNOWLEDGER (Output_property_engraver, grob);
 ADD_TRANSLATOR (Output_property_engraver,
-
                /* doc */
-               "Apply a procedure to any grob acknowledged. ",
+               "Apply a procedure to any grob acknowledged.",
                
                /* create */
                "",
                
-               /* accept */
-               "layout-instruction",
-               
                /* read */
                "",
                
                /* write */
-               "");
+               ""
+               );