release: 1.5.34

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 7fbab5fe9d9f2dacdb58b6ff8fb456ce14dd3d5c..ad4452a3eee76d903d6d59456b746bd3f4fcf411 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,24 +3,74 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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"
 
-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))
+    {
+      SCM val = music_l ()->get_mus_property ("value");
+      bool ok= true;
+      if (val != SCM_EOL)
+       ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
+      if (ok)
+       report_to_l ()->internal_set_property (sym, val);
+    }
+  Simple_music_iterator::process (m);
 }
 
 void
-Property_iterator::process_and_next (Moment m)
+Property_unset_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 sym = music_l ()->get_mus_property ("symbol");
+  if (gh_symbol_p (sym))
+    {
+      report_to_l ()->unset_property (sym);
+    }
+  Simple_music_iterator::process (m);
 }
 
-IMPLEMENT_IS_TYPE_B1(Property_iterator, Music_iterator);
+
+void
+Push_property_iterator::process (Moment m)
+{
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  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 (),
+                                           sym, eprop, SCM_UNDEFINED);
+
+  Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, val);
+  
+  Simple_music_iterator::process (m);
+}
+
+void
+Pop_property_iterator::process (Moment m)
+{
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM eprop = music_l ()->get_mus_property ("grob-property");
+  Translator_def::apply_pushpop_property (report_to_l (), sym, 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);