X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=2dc50c72e9816d2235ecf077aeec314088f0e4d6;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=f31cd652fc855241046e36c56dd4dcbf90eb5443;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index f31cd652fc..2dc50c72e9 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,71 +1,66 @@
-/*   
-  output-property-engraver.cc -- implement Output_property_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2014 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"
+
 
 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);
 
-  PRECOMPUTED_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_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 ());
     }
 }
 
@@ -79,13 +74,17 @@ Output_property_engraver::Output_property_engraver ()
 {
 }
 
-#include "translator.icc"
-
+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",
-/* acks  */       "grob-interface",
-/* reads */       "",
-/* write */       "");
+		/* doc */
+		"Apply a procedure to any grob acknowledged.",
+		
+		/* create */
+		"",
+		
+		/* read */
+		"",
+		
+		/* write */
+		""
+		);