X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=cde3cc848e39f2481613c69bf4bed673eca56ade;hb=d088cb4d9526a4a93e92bdf3d0b6cbb012883b6f;hp=7b2dddb1da8d22da6d2946910fee11a6c37b84b2;hpb=ce521e79fd7669b45c8c1132e4b5693a03b5d90a;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 7b2dddb1da..cde3cc848e 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "property-iterator.hh"
 #include "music.hh"
 #include "translator-def.hh"
 #include "translator-group.hh"
+#include "global-translator.hh"
 
 
 bool check_grob(Music *mus, SCM sym);
@@ -21,15 +22,15 @@ bool check_grob(Music *mus, SCM sym);
 void
 Property_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_mus_property ("symbol");
   if (gh_symbol_p (sym))
     {
-      SCM val = music_l ()->get_mus_property ("value");
+      SCM val = get_music ()->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);
+	report_to ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
@@ -37,16 +38,48 @@ Property_iterator::process (Moment m)
 void
 Property_unset_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
+  SCM sym = get_music ()->get_mus_property ("symbol");
   type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
-  report_to_l ()->unset_property (sym);
+  report_to ()->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);
+  Translator_group * tg
+    = dynamic_cast<Translator_group*> (unsmob_translator (translator));
+  SCM sym = m->get_mus_property ("symbol");
+
+  tg->unset_property (sym);
+  return SCM_UNSPECIFIED;
+}
+
+void
+Property_iterator::do_quit ()
+{
+  if (to_boolean (get_music ()->get_mus_property  ("once")))
+    {
+      SCM trans = report_to()->self_scm();
+      SCM music = get_music()->self_scm();
+
+      Global_translator * tg=  report_to()->top_translator ();
+
+      tg->add_finalization (scm_list_n (once_finalization_proc,
+					trans, music, SCM_UNDEFINED));
+    }
+}
+
 
 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)
 {
@@ -56,8 +89,8 @@ check_grob(Music *mus, SCM sym)
     }
   
   
-  SCM type_p = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
-  bool ok = type_p == list_p;
+  SCM type = scm_object_property (sym, ly_symbol2scm ("translation-type?"));
+  bool ok = type == list_p;
 
   if (!ok)
     {
@@ -69,35 +102,70 @@ check_grob(Music *mus, SCM sym)
 void
 Push_property_iterator::process (Moment m)
 {
-  SCM sym = music_l ()->get_mus_property ("symbol");
-  if (check_grob (music_l (), sym))
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  if (check_grob (get_music (), sym))
     {
-      SCM eprop = music_l ()->get_mus_property ("grob-property");
-      SCM val = music_l ()->get_mus_property ("grob-value");
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      SCM val = get_music ()->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);
+      if (to_boolean (get_music ()->get_mus_property ("pop-first"))
+	  && !to_boolean (get_music ()->get_mus_property ("once"))
+	  )
+	report_to()->execute_pushpop_property (sym, eprop, SCM_UNDEFINED);
 
-      Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, val);
+      report_to()->execute_pushpop_property (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);
+  Translator_group * tg = dynamic_cast<Translator_group*> (unsmob_translator (trans));
+    
+  SCM sym = mus->get_mus_property ("symbol");
+  if (check_grob (mus, sym))
+    {
+      SCM eprop = mus->get_mus_property ("grob-property");
+  
+      tg->execute_pushpop_property (sym, eprop, SCM_UNDEFINED);
+    }
+  return SCM_UNSPECIFIED;
+}
+
+void
+Push_property_iterator::do_quit ()
+{
+  if (to_boolean (get_music ()->get_mus_property  ("once")))
+    {
+      SCM trans = report_to()->self_scm();
+      SCM music = get_music ()->self_scm();
+
+      Global_translator * tg=  report_to()->top_translator ();
+      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");
-  if (check_grob (music_l (), sym))
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  
+  if (check_grob (get_music (), sym))
     {
-      SCM eprop = music_l ()->get_mus_property ("grob-property");
-      Translator_def::apply_pushpop_property (report_to_l (), sym, eprop, SCM_UNDEFINED);
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      report_to()->execute_pushpop_property (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);
+