* VERSION (MY_PATCH_LEVEL): make 1.7.0

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

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 480b506858d7fe62b885c1cf14861351a42ec91c..34f46db21a738d12a4b194f73b197ca815e7049c 100644 (file)
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -10,6 +10,7 @@
 #include "music.hh"
 #include "translator-def.hh"
 #include "translator-group.hh"
+#include "global-translator.hh"
 
 
 bool check_grob(Music *mus, SCM sym);
@@ -44,6 +45,34 @@ Property_unset_iterator::process (Moment m)
   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;
 
@@ -75,7 +104,9 @@ Push_property_iterator::process (Moment m)
       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")))
+      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);
 
@@ -84,6 +115,38 @@ Push_property_iterator::process (Moment m)
   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)
 {
@@ -97,7 +160,9 @@ Pop_property_iterator::process (Moment m)
 }
 
 
+
 IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);
+