X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=c7a6759220f2d97511853569461f10554dbc854f;hb=a14b5b5ff23548ad5040245c53896ba6afb1b226;hp=3d43a85a6e646b693ac6fa9d9179d48f249f11d9;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 3d43a85a6e..c7a6759220 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -9,11 +9,12 @@
 
 #include "engraver.hh"
 #include "grob.hh"
-#include "translator-group.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_;
 
@@ -40,11 +41,11 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
   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 (is_procedure (pred))
 	{
 	  /*
 	    should typecheck pred. 
@@ -52,24 +53,24 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
 	  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
 	{
-	  Translator_group * d =
-	    dynamic_cast<Translator_group*> (inf.origin_trans_);
+	  Context * d =
+	    dynamic_cast<Context *> (inf.origin_trans_);
 
 	  if (!d)
-	    d = dynamic_cast<Translator_group*> (inf.origin_trans_->daddy_trans_);
+	    d = dynamic_cast<Context *> (inf.origin_trans_->get_parent_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_trans_->self_scm());
+		      inf.grob_->self_scm (),
+		      d->self_scm (), 
+		      get_parent_context ()->self_scm ());
 	}
     }
 }
@@ -80,11 +81,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,
+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*/       "",