X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=acbc5e0f751e1f602d7e3da12303e7752291d576;hb=333ec20b00d7e6952cb7d3800a82548957feb803;hp=ad4452a3eee76d903d6d59456b746bd3f4fcf411;hpb=8d7a55721e3305f745c0b24c367de002dd197825;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index ad4452a3ee..acbc5e0f75 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,30 +3,32 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
 #include "music.hh"
-#include "translator-def.hh"
-#include "translator-group.hh"
+#include "context-def.hh"
+#include "global-context.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::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
-  if (gh_symbol_p (sym))
+  SCM sym = get_music ()->get_property ("symbol");
+  if (is_symbol (sym))
     {
-      SCM val = music_l ()->get_mus_property ("value");
+      SCM val = get_music ()->get_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);
+	get_outlet ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -34,43 +36,132 @@ Property_iterator::process (Moment m)
 void
 Property_unset_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
-  if (gh_symbol_p (sym))
+  SCM sym = get_music ()->get_property ("symbol");
+  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
+  get_outlet ()->unset_property (sym);
+
+  Simple_music_iterator::process (m);
+}
+
+MAKE_SCHEME_CALLBACK (Property_iterator,once_finalization, 2);
+SCM
+Property_iterator::once_finalization (SCM translator, SCM music )
+{
+  Music * m = unsmob_music (music);
+  Context * tg
+    = dynamic_cast<Context *> (unsmob_context (translator));
+  SCM sym = m->get_property ("symbol");
+
+  tg->unset_property (sym);
+  return SCM_UNSPECIFIED;
+}
+
+void
+Property_iterator::do_quit ()
+{
+  if (to_boolean (get_music ()->get_property  ("once")))
     {
-      report_to_l ()->unset_property (sym);
+      SCM trans = get_outlet ()->self_scm ();
+      SCM music = get_music ()->self_scm ();
+
+      Global_context * tg = get_outlet ()->get_global_context ();
+      tg->add_finalization (scm_list_n (once_finalization_proc,
+					trans, music, SCM_UNDEFINED));
     }
-  Simple_music_iterator::process (m);
 }
 
 
+SCM list_p = 0;
+
+/*
+  This is a rather crude check: we merely check if the translator
+  property is a list.
+ */
+bool
+check_grob (Music *mus, SCM sym)
+{
+  if (!list_p)
+    {
+      list_p = scm_c_eval_string ("list?");
+    }
+  
+  
+  SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
+  bool ok = type == list_p;
+
+  if (!ok)
+    {
+      mus->origin ()->warning (_f ("Not a grob name, `%s'." , ly_symbol2string (sym)));
+    }
+  return  ok;
+}
+
 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");
+  SCM sym = get_music ()->get_property ("symbol");
+  if (check_grob (get_music (), sym))
+    {
+      SCM eprop = get_music ()->get_property ("grob-property");
+      SCM val = get_music ()->get_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);
+      if (to_boolean (get_music ()->get_property ("pop-first"))
+	  && !to_boolean (get_music ()->get_property ("once")))
+	execute_pushpop_property (get_outlet (), sym, eprop, SCM_UNDEFINED);
 
-  Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, val);
-  
+      execute_pushpop_property (get_outlet (), sym, eprop, val);
+    }
   Simple_music_iterator::process (m);
 }
 
+MAKE_SCHEME_CALLBACK (Push_property_iterator,once_finalization, 2);
+SCM
+Push_property_iterator::once_finalization (SCM trans, SCM music)
+{
+  Music * mus = unsmob_music (music);
+  Context * tg = dynamic_cast<Context *> (unsmob_context (trans));
+    
+  SCM sym = mus->get_property ("symbol");
+  if (check_grob (mus, sym))
+    {
+      SCM eprop = mus->get_property ("grob-property");
+  
+      execute_pushpop_property (tg, sym, eprop, SCM_UNDEFINED);
+    }
+  return SCM_UNSPECIFIED;
+}
+
+void
+Push_property_iterator::do_quit ()
+{
+  if (to_boolean (get_music ()->get_property  ("once")))
+    {
+      SCM trans = get_outlet ()->self_scm ();
+      SCM music = get_music ()->self_scm ();
+
+      Global_context * tg=  get_outlet ()->get_global_context ();
+      tg->add_finalization (scm_list_n (once_finalization_proc,
+					trans, music, SCM_UNDEFINED));
+    }
+}
+
 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);
+  SCM sym = get_music ()->get_property ("symbol");
   
+  if (check_grob (get_music (), sym))
+    {
+      SCM eprop = get_music ()->get_property ("grob-property");
+execute_pushpop_property (get_outlet (), 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);
+