Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index c80cc9c051cd6ad23e0d843300a36fef6d972247..7f59d44430b7b433f17339c2fa2e70684e9848e4 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
  */
 
@@ -11,14 +11,17 @@
 #include "grob.hh"
 #include "context.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<Music*> props_;
+  DECLARE_ACKNOWLEDGER (grob)
 
-  virtual void stop_translation_timestep ();
-  virtual void acknowledge_grob (Grob_info);
+  void stop_translation_timestep ();
   virtual bool try_music (Music*);
 };
 
@@ -28,8 +31,15 @@ Output_property_engraver::try_music (Music* m)
 {
   if (m->is_mus_type ("layout-instruction"))
     {
-      props_.push (m);
-      return true;
+      /*
+       UGH. Only swallow the output property event in the context
+       it was intended for. This is inelegant but not inefficient.
+      */
+      if (context ()->is_alias (m->get_property ("context-type")))
+        {
+          props_.push_back (m);
+          return true;
+        }
     }
   return false;
 }
@@ -37,35 +47,15 @@ Output_property_engraver::try_music (Music* m)
 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_c_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 = inf.context ();
-         SCM proc = o->get_property ("procedure");
-         scm_call_3 (proc,
-                     inf.grob ()->self_scm (),
-                     d->self_scm (), 
-                     context ()->self_scm ());
-       }
+      Music *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,11 +69,20 @@ Output_property_engraver::Output_property_engraver ()
 {
 }
 
+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 */
+               "",
+               
+               /* accept */
+               "layout-instruction",
+               
+               /* read */
+               "",
+               
+               /* write */
+               "");