2003 -> 2004

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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 527b0c103a98d96e777369efb184b208615329af..3d43a85a6e646b693ac6fa9d9179d48f249f11d9 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,31 +3,18 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "engraver.hh"
 #include "grob.hh"
-#include "output-property-music-iterator.hh"
+#include "translator-group.hh"
 
 class Output_property_engraver : public Engraver
 {
 TRANSLATOR_DECLARATIONS(Output_property_engraver);
 protected:
-
-  /*
-    should do this with \once and \push ?
-
-
-      \property Voice.outputProperties \push #pred = #modifier
-
-      where both MODIFIER and PRED are functions taking a
-      grob.
-      
-   */
-
-  
   Link_array<Music> props_;
 
   virtual void stop_translation_timestep ();
@@ -39,8 +26,7 @@ protected:
 bool
 Output_property_engraver::try_music (Music* m)
 {
-  if (m->get_mus_property ("iterator-ctor") ==
-      Output_property_music_iterator::constructor_cxx_function)
+  if (m->is_mus_type ("layout-instruction"))
     {
       props_.push (m);
       return true;
@@ -55,17 +41,35 @@ Output_property_engraver::acknowledge_grob (Grob_info inf)
     {
       Music * o = props_[i];
       SCM pred = o->get_mus_property ("predicate");
-      
-      /*
-       should typecheck pred. 
-       */
-      SCM result=gh_apply (pred,
-                          scm_list_n (inf.grob_l_->self_scm (), SCM_UNDEFINED));
-      if (to_boolean (result))
+
+
+
+      if (gh_procedure_p (pred))
        {
-         SCM sym = o->get_mus_property ("grob-property");
-         SCM val = o->get_mus_property ("grob-value");
-         inf.grob_l_->set_grob_property (sym, val);
+         /*
+           should typecheck pred. 
+         */
+         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);
+           }
+       }
+      else
+       {
+         Translator_group * d =
+           dynamic_cast<Translator_group*> (inf.origin_trans_);
+
+         if (!d)
+           d = dynamic_cast<Translator_group*> (inf.origin_trans_->daddy_trans_);
+         
+         SCM proc = o->get_mus_property ("procedure");
+         scm_call_3 (proc,
+                     inf.grob_->self_scm(),
+                     d->self_scm(), 
+                     daddy_trans_->self_scm());
        }
     }
 }
@@ -81,9 +85,10 @@ Output_property_engraver::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.",
+/* 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 */       "");