X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=ccef5051f111403bc87cd5f9bf77ca23f403ff60;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=04a842421425aea78c2802e52f690cad3384b9c5;hpb=94a1966c72301b8bd1d8bb3b8628c3f089d007cf;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 04a8424214..ccef5051f1 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,77 +1,71 @@
-/*   
-  output-property-engraver.cc --  implement Output_property_engraver
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.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"
 
 
 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_;
+  
+  void acknowledge_grob (Grob_info);
+  void listen_apply_output (Stream_event *);
 
-  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)
+// We only run this in the Score context, so all events are likely to
+// find a target
+void
+Output_property_engraver::listen_apply_output (Stream_event *ev)
 {
-  if (m->is_mus_type ("layout-instruction"))
-    {
-      props_.push (m);
-      return true;
-    }
-  return false;
+  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_procedure_p (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 =
-	    dynamic_cast<Context *> (inf.origin_trans_);
-
-	  if (!d)
-	    d = dynamic_cast<Context *> (inf.origin_trans_->daddy_context_);
-	  
-	  SCM proc = o->get_property ("procedure");
-	  scm_call_3 (proc,
-		      inf.grob_->self_scm (),
-		      d->self_scm (), 
-		      daddy_context_->self_scm ());
-	}
+      Stream_event *o = props_[i];
+      Context *d = inf.context ();
+      SCM grob = o->get_property ("symbol");
+      if (scm_is_symbol (grob)
+          && ly_symbol2string (grob) != inf.grob ()->name ())
+        continue;
+      SCM typ = o->get_property ("context-type");
+      SCM proc = o->get_property ("procedure");
+      for (Context *c = d; c; c = c->get_parent_context ())
+        {
+          if (c->is_alias (typ))
+            scm_call_3 (proc,
+                        inf.grob ()->self_scm (),
+                        d->self_scm (),
+                        c->self_scm ());
+        }
     }
 }
 
@@ -81,15 +75,28 @@ Output_property_engraver::stop_translation_timestep ()
   props_.clear ();
 }
 
-Output_property_engraver::Output_property_engraver ()
+Output_property_engraver::Output_property_engraver (Context *c)
+  : Engraver (c)
+{
+}
+
+void
+Output_property_engraver::boot ()
 {
+  ADD_LISTENER (Output_property_engraver, apply_output);
+  ADD_ACKNOWLEDGER (Output_property_engraver, grob);
 }
 
-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_TRANSLATOR (Output_property_engraver,
+		/* doc */
+		"Apply a procedure to any grob acknowledged.",
+		
+		/* create */
+		"",
+		
+		/* read */
+		"",
+		
+		/* write */
+		""
+		);