X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=34f46db21a738d12a4b194f73b197ca815e7049c;hb=b2023e711e576d58da3c51a4b3fd5d327a0fe013;hp=bb7a40395fe77b6c07645e97f854dbb611eaf919;hpb=cda8fc1780778b760905c8832f7e984161218f20;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index bb7a40395f..34f46db21a 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -3,60 +3,166 @@
 
   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 "music.hh"
 #include "translator-def.hh"
 #include "translator-group.hh"
+#include "global-translator.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_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 (val, sym, ly_symbol2scm ("translation-type?"));
+	ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
       if (ok)
-	report_to_l ()->set_property (sym, val);
+	report_to ()->internal_set_property (sym, val);
     }
   Simple_music_iterator::process (m);
 }
 
 void
-Push_property_iterator::process (Moment m)
+Property_unset_iterator::process (Moment m)
+{
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));  
+  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 ()
 {
-  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 (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 ();
 
-  if (to_boolean (music_l_->get_mus_property ( "pop-first")))
-    Translator_def::apply_pushpop_property (report_to_l (),
-					    syms, eprop, SCM_UNDEFINED);
+      tg->add_finalization (scm_list_n (once_finalization_proc,
+					trans, music, SCM_UNDEFINED));
+    }
+}
 
-  Translator_def::apply_pushpop_property (report_to_l (), syms, eprop, val);
+
+SCM list_p = 0;
+
+bool
+check_grob(Music *mus, SCM sym)
+{
+  if (!list_p)
+    {
+      list_p = gh_eval_str ("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 = get_music ()->get_mus_property ("symbol");
+  if (check_grob (get_music (), sym))
+    {
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      SCM val = get_music ()->get_mus_property ("grob-value");
+
+      if (to_boolean (get_music ()->get_mus_property ("pop-first"))
+	  && !to_boolean (get_music ()->get_mus_property ("once"))
+	  )
+	Translator_def::apply_pushpop_property (report_to (),
+						sym, eprop, SCM_UNDEFINED);
+
+      Translator_def::apply_pushpop_property (report_to (), 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");
+  
+      Translator_def::apply_pushpop_property (tg, 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 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);
-  
+  SCM sym = get_music ()->get_mus_property ("symbol");
+  if (check_grob (get_music (), sym))
+    {
+      SCM eprop = get_music ()->get_mus_property ("grob-property");
+      Translator_def::apply_pushpop_property (report_to (), 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 (Pop_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_iterator);
+IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);
+