*** empty log message ***

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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 5403d9d7c287e6cdf378b82e25f63c2cc60b6abc..79785c85d3758e9ad7352cbfe7b8fd1ee6d24fcb 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -1,9 +1,9 @@
 /*   
-  output-property-engraver.cc --  implement Output_property_engraver
+  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>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -13,12 +13,12 @@
 
 class Output_property_engraver : public Engraver
 {
-TRANSLATOR_DECLARATIONS (Output_property_engraver);
+  TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
   Link_array<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*);
 };
 
@@ -42,32 +42,25 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
       Music * o = props_[i];
       SCM pred = o->get_property ("predicate");
 
-
-
-      if (ly_c_procedure_p (pred))
+      if (ly_is_procedure (pred))
        {
          /*
            should typecheck pred. 
          */
-         SCM result = scm_call_1 (pred, inf.grob_->self_scm ());
+         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);
+             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_->context ());
-         
+         Context * d = inf.context ();
          SCM proc = o->get_property ("procedure");
          scm_call_3 (proc,
-                     inf.grob_->self_scm (),
+                     inf.grob ()->self_scm (),
                      d->self_scm (), 
                      context ()->self_scm ());
        }
@@ -84,11 +77,12 @@ 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 "
+/* doc */ "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 */       "",
+/* create */ "",
+/* accept */ "layout-instruction",
+/* read */ "",
 /* write */       "");