X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Foutput-property-engraver.cc;h=7db91b877db2e37e23aa8d2de7d20e45df19f69e;hb=a2991295b2c1fb36bec19de207161855ca3c1756;hp=78227b5f60820bc50155f81e4bdc96b5ccffc352;hpb=c7205110d9cf8c4acb6149047f1674e2aa1a348b;p=lilypond.git

diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc
index 78227b5f60..7db91b877d 100644
--- a/lily/output-property-engraver.cc
+++ b/lily/output-property-engraver.cc
@@ -3,65 +3,78 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "output-property.hh"
 #include "engraver.hh"
-#include "score-element.hh"
+#include "grob.hh"
+#include "output-property-music-iterator.hh"
 
 class Output_property_engraver : public Engraver
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
 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<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->get_mus_property ("iterator-ctor") ==
+      Output_property_music_iterator::constructor_cxx_function)
     {
-      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_);
+      Music * o = props_[i];
+      SCM pred = o->get_mus_property ("predicate");
       
       /*
 	should typecheck pred. 
        */
       SCM result=gh_apply (pred,
-			   gh_list (inf.elem_l_->self_scm_, SCM_UNDEFINED));
+			   gh_list (inf.elem_l_->self_scm (), SCM_UNDEFINED));
       if (to_boolean (result))
 	{
-	  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_));
+	  SCM sym = o->get_mus_property ("symbol");
+	  SCM val = o->get_mus_property ("value");
+	  inf.elem_l_->set_grob_property (sym, val);
 	}
     }
 }
 
 void
-Output_property_engraver::do_pre_move_processing ()
+Output_property_engraver::stop_translation_timestep ()
 {
   props_.clear ();
 }
 
-ADD_THIS_TRANSLATOR(Output_property_engraver);
+ADD_THIS_TRANSLATOR (Output_property_engraver);