X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=7efe061304ad1c467068bb6a900af24c895fb2f1;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=d3eeccedfccc5578563cad8cfcc5e0d918f10967;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index d3eeccedfc..7efe061304 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,15 +1,26 @@
-/*   
-  output-property-engraver.cc -- implement Output_property_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include "engraver.hh"
-#include "grob.hh"
 #include "context.hh"
+#include "grob.hh"
+#include "stream-event.hh"
 
 #include "translator.icc"
 
@@ -18,23 +29,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 +54,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 +74,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 */
-		"");
+		""
+		);