release: 1.5.29

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 0af9420ebffb729a435fc4369b7e25d9f09462f9..726a79bf1da9553cd2af25af05dbb95b37693329 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,11 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
-#include "translation-property.hh"
+#include "music.hh"
+#include "translator-def.hh"
 #include "translator-group.hh"
 
 /**
@@ -15,11 +16,61 @@
   translation unit, and set the property.
   */
 void
-Property_iterator::do_process_and_next (Moment m)
+Property_iterator::process (Moment m)
 {
-  Translation_property const * prop = dynamic_cast<Translation_property const*> (music_l_);
-  if (prop->var_str_.length_i ())
-    report_to_l ()->set_property (prop->var_str_, prop->value_);
-  Music_iterator::do_process_and_next (m);
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  if (gh_symbol_p (sym))
+    {
+      SCM val = music_l ()->get_mus_property ("value");
+      bool ok= true;
+      if (val != SCM_EOL)
+       ok = type_check_assignment (val, sym, ly_symbol2scm ("translation-type?"));
+      if (ok)
+       report_to_l ()->internal_set_property (sym, val);
+    }
+  Simple_music_iterator::process (m);
 }
 
+void
+Property_unset_iterator::process (Moment m)
+{
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  if (gh_symbol_p (sym))
+    {
+      report_to_l ()->unset_property (sym);
+    }
+  Simple_music_iterator::process (m);
+}
+
+
+void
+Push_property_iterator::process (Moment m)
+{
+  SCM syms = music_l ()->get_mus_property ("symbols");
+  SCM eprop = music_l ()->get_mus_property ("grob-property");
+  SCM val = music_l ()->get_mus_property ("grob-value");
+
+  if (to_boolean (music_l ()->get_mus_property ("pop-first")))
+    Translator_def::apply_pushpop_property (report_to_l (),
+                                           syms, eprop, SCM_UNDEFINED);
+
+  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val);
+  
+  Simple_music_iterator::process (m);
+}
+
+void
+Pop_property_iterator::process (Moment m)
+{
+  SCM syms = music_l ()->get_mus_property ("symbols");
+  SCM eprop = music_l ()->get_mus_property ("grob-property");
+  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, SCM_UNDEFINED);
+  
+  Simple_music_iterator::process (m);
+}
+
+
+IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);