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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index d12b6530fc..7efe061304 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,73 +1,66 @@
-/*   
-  output-property-engraver.cc --  implement Output_property_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
 
-#include "engraver.hh"
-#include "grob.hh"
-#include "output-property-music-iterator.hh"
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-class Output_property_engraver : public Engraver
-{
-public:
-  VIRTUAL_COPY_CONS(Translator);
-protected:
+  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.
 
-  /*
-    should do this with \once and \push ?
+  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 "context.hh"
+#include "grob.hh"
+#include "stream-event.hh"
 
-      \property Voice.outputProperties \push #pred = #modifier
+#include "translator.icc"
 
-      where both MODIFIER and PRED are functions taking a
-      grob.
-      
-   */
 
+class Output_property_engraver : public Engraver
+{
+  TRANSLATOR_DECLARATIONS (Output_property_engraver);
+protected:
+  vector<Stream_event*> props_;
   
-  Link_array<Music> 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->get_mus_property ("type") ==
-      Output_property_music_iterator::constructor_cxx_function)
-    {
-      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");
-      
-      /*
-	should typecheck pred. 
-       */
-      SCM result=gh_apply (pred,
-			   gh_list (inf.elem_l_->self_scm (), SCM_UNDEFINED));
-      if (to_boolean (result))
-	{
-	  SCM sym = o->get_mus_property ("symbol");
-	  SCM val = o->get_mus_property ("value");
-	  inf.elem_l_->set_grob_property (sym, val);
-	}
+      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,4 +70,21 @@ Output_property_engraver::stop_translation_timestep ()
   props_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Output_property_engraver);
+Output_property_engraver::Output_property_engraver ()
+{
+}
+
+ADD_ACKNOWLEDGER (Output_property_engraver, grob);
+ADD_TRANSLATOR (Output_property_engraver,
+		/* doc */
+		"Apply a procedure to any grob acknowledged.",
+		
+		/* create */
+		"",
+		
+		/* read */
+		"",
+		
+		/* write */
+		""
+		);