* stepmake/aclocal.m4 (STEPMAKE_KPATHSEA): Do not include

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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 7af3914c8e6d242f493e6862714c914f8cb4eee0..6314e33bcff9dfb8664b968b29869a8d10c170d6 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -11,10 +11,9 @@
 #include "grob.hh"
 #include "context.hh"
 
-
 class Output_property_engraver : public Engraver
 {
-TRANSLATOR_DECLARATIONS(Output_property_engraver);
+TRANSLATOR_DECLARATIONS (Output_property_engraver);
 protected:
   Link_array<Music> props_;
 
@@ -38,24 +37,24 @@ Output_property_engraver::try_music (Music* m)
 void
 Output_property_engraver::acknowledge_grob (Grob_info inf)
 {
-  for (int i=props_.size (); i--;)
+  for (int i = props_.size (); i--;)
     {
       Music * o = props_[i];
-      SCM pred = o->get_mus_property ("predicate");
+      SCM pred = o->get_property ("predicate");
 
 
 
-      if (gh_procedure_p (pred))
+      if (ly_c_procedure_p (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_mus_property ("grob-property");
-             SCM val = o->get_mus_property ("grob-value");
-             inf.grob_->internal_set_grob_property (sym, val);
+             SCM sym = o->get_property ("grob-property");
+             SCM val = o->get_property ("grob-value");
+             inf.grob_->internal_set_property (sym, val);
            }
        }
       else
@@ -64,13 +63,13 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
            dynamic_cast<Context *> (inf.origin_trans_);
 
          if (!d)
-           d = dynamic_cast<Context *> (inf.origin_trans_->daddy_context_);
+           d = dynamic_cast<Context *> (inf.origin_trans_->context ());
          
-         SCM proc = o->get_mus_property ("procedure");
+         SCM proc = o->get_property ("procedure");
          scm_call_3 (proc,
-                     inf.grob_->self_scm(),
-                     d->self_scm(), 
-                     daddy_context_->self_scm());
+                     inf.grob_->self_scm (),
+                     d->self_scm (), 
+                     context ()->self_scm ());
        }
     }
 }
@@ -81,11 +80,11 @@ Output_property_engraver::stop_translation_timestep ()
   props_.clear ();
 }
 
-Output_property_engraver::Output_property_engraver()
+Output_property_engraver::Output_property_engraver ()
 {
 }
 
-ENTER_DESCRIPTION(Output_property_engraver,
+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*/       "",