release: 1.3.87

[lilypond.git] / lily / property-iterator.cc

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 7fbab5fe9d9f2dacdb58b6ff8fb456ce14dd3d5c..ea8273d7611b1bf241f7530bd1d170c166cccf71 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,24 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
 #include "translation-property.hh"
+#include "translator-def.hh"
 #include "translator-group.hh"
 
-Property_iterator::Property_iterator (Translation_property *prop_l)
+/**
+  There is no real processing to a property: just lookup the
+  translation unit, and set the property.
+  */
+void
+Property_iterator::process (Moment m)
 {
-  property_l_ = prop_l;
+  SCM sym = music_l_->get_mus_property ("symbol");
+  if (gh_symbol_p(sym))
+    report_to_l ()->set_property (sym, music_l_->get_mus_property ("value"));
+  Simple_music_iterator::process (m);
 }
 
 void
-Property_iterator::process_and_next (Moment m)
+Push_property_iterator::process (Moment m)
 {
-  if (property_l_->var_str_)
-    report_to_l ()->set_property (property_l_->var_str_, property_l_->value_);
-  Music_iterator::process_and_next (m);
+  SCM syms = music_l_->get_mus_property ("symbols");
+  SCM eprop = music_l_->get_mus_property ("element-property");
+  SCM val = music_l_->get_mus_property ("element-value");
+
+  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val);
+  
+  Simple_music_iterator::process (m);
 }
 
-IMPLEMENT_IS_TYPE_B1(Property_iterator, Music_iterator);
+void
+Pop_property_iterator::process (Moment m)
+{
+  SCM syms = music_l_->get_mus_property ("symbols");
+  SCM eprop = music_l_->get_mus_property ("element-property");
+  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, SCM_UNDEFINED);
+  
+  Simple_music_iterator::process (m);
+}