clap

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 0e50832e64a7d55013b491b3366e171c7cab123d..7b2dddb1da8d22da6d2946910fee11a6c37b84b2 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,70 +3,101 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 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"
 
+
+bool check_grob(Music *mus, SCM sym);
+
 /**
-  There is no real processing to a property: just lookup the
-  translation unit, and set the property.
-  */
+   There is no real processing to a property: just lookup the
+   translation unit, and set the property.
+*/
 void
-Property_iterator::do_process_and_next (Moment m)
+Property_iterator::process (Moment m)
 {
-  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"));
-  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 (sym, val, ly_symbol2scm ("translation-type?"));
+      if (ok)
+       report_to_l ()->internal_set_property (sym, val);
+    }
+  Simple_music_iterator::process (m);
 }
 
-
 void
-Push_property_iterator::do_process_and_next (Moment m)
+Property_unset_iterator::process (Moment 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");
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
+  report_to_l ()->unset_property (sym);
 
-  for (SCM s = syms; gh_pair_p (s); s = gh_cdr (s))
+  Simple_music_iterator::process (m);
+}
+
+
+SCM list_p = 0;
+
+bool
+check_grob(Music *mus, SCM sym)
+{
+  if (!list_p)
     {
-      SCM sym = gh_car (s);
-      if (gh_symbol_p(sym))
-      {
-       SCM prev = report_to_l ()->get_property (sym);
-
-       prev = gh_cons (gh_cons (eprop, val), prev);
-       report_to_l ()->set_property (gh_car (s), prev);
-      }
+      list_p = gh_eval_str ("list?");
     }
-  Music_iterator::do_process_and_next (m);
+  
+  
+  SCM type_p = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
+  bool ok = type_p == list_p;
+
+  if (!ok)
+    {
+      mus->origin()->warning (_f("Not a grob name, `%s'." , ly_symbol2string (sym)));
+    }
+  return  ok;
 }
 
 void
-Pop_property_iterator::do_process_and_next (Moment m)
+Push_property_iterator::process (Moment m)
 {
-  SCM syms = music_l_->get_mus_property ("symbols");
-  SCM eprop = music_l_->get_mus_property ("element-property");
-  for (SCM s = syms; gh_pair_p (s); s = gh_cdr (s)) 
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  if (check_grob (music_l (), sym))
     {
-    SCM sym = gh_car (s);
-    if (gh_symbol_p(sym))
-      {
-       SCM prev = report_to_l ()->get_property (sym);
-
-       SCM newprops= SCM_EOL ;
-       while (gh_pair_p (prev) && gh_caar (prev) != eprop)
-         {
-           newprops = gh_cons (gh_car (prev), newprops);
-           prev = gh_cdr (prev);
-         }
-
-       newprops = scm_reverse_x (newprops, gh_cdr (prev));
-       report_to_l ()->set_property (sym, newprops);
-      }
+      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);
     }
-  Music_iterator::do_process_and_next (m);
+  Simple_music_iterator::process (m);
 }
+
+void
+Pop_property_iterator::process (Moment m)
+{
+  SCM sym = music_l ()->get_mus_property ("symbol");
+  if (check_grob (music_l (), sym))
+    {
+      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);