2003 -> 2004

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

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 78227b5f60820bc50155f81e4bdc96b5ccffc352..3d43a85a6e646b693ac6fa9d9179d48f249f11d9 100644 (file)
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,65 +3,92 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "output-property.hh"
 #include "engraver.hh"
-#include "score-element.hh"
+#include "grob.hh"
+#include "translator-group.hh"
 
 class Output_property_engraver : public Engraver
 {
-public:
-  VIRTUAL_COPY_CONS(Translator);
+TRANSLATOR_DECLARATIONS(Output_property_engraver);
 protected:
-  
-  Link_array<Output_property> props_;
+  Link_array<Music> props_;
 
-  virtual void do_pre_move_processing ();
-  virtual void acknowledge_element (Score_element_info);
-  virtual bool do_try_music (Music*);
+  virtual void stop_translation_timestep ();
+  virtual void acknowledge_grob (Grob_info);
+  virtual bool try_music (Music*);
 };
 
 
 bool
-Output_property_engraver::do_try_music (Music* m)
+Output_property_engraver::try_music (Music* m)
 {
-  if (Output_property * o = dynamic_cast<Output_property*> (m))
+  if (m->is_mus_type ("layout-instruction"))
     {
-      props_.push (o);
+      props_.push (m);
       return true;
     }
   return false;
 }
 
 void
-Output_property_engraver::acknowledge_element (Score_element_info inf)
+Output_property_engraver::acknowledge_grob (Grob_info inf)
 {
-  for (int i=props_.size (); i--; )
+  for (int i=props_.size (); i--;)
     {
-      Output_property * o = props_[i];
-      SCM pred = gh_car (o->pred_sym_val_list_);
-      
-      /*
-       should typecheck pred. 
-       */
-      SCM result=gh_apply (pred,
-                          gh_list (inf.elem_l_->self_scm_, SCM_UNDEFINED));
-      if (to_boolean (result))
+      Music * o = props_[i];
+      SCM pred = o->get_mus_property ("predicate");
+
+
+
+      if (gh_procedure_p (pred))
+       {
+         /*
+           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
        {
-         Score_element::ly_set_elt_property (inf.elem_l_->self_scm_,
-                                             gh_cadr (o->pred_sym_val_list_),
-                                             gh_caddr (o->pred_sym_val_list_));
+         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());
        }
     }
 }
 
 void
-Output_property_engraver::do_pre_move_processing ()
+Output_property_engraver::stop_translation_timestep ()
 {
   props_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Output_property_engraver);
+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.",
+/* creats*/       "",
+/* accepts */     "layout-instruction",
+/* acks  */       "grob-interface",
+/* reads */       "",
+/* write */       "");