X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fproperty-iterator.cc;h=af1b38d159a04c0c07b21311999917c0ae28614a;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=62f316b7f1b7220e12d9e8bf773aa5921337fd00;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index 62f316b7f1..af1b38d159 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -31,13 +31,26 @@ bool check_grob (Music *mus, SCM sym);
    translation unit, and set the property.
 */
 void
-Property_iterator::process (Moment m)
+Property_iterator::process (Moment mom)
 {
-  send_stream_event (get_outlet (), "SetProperty", get_music ()->origin (),
-		     ly_symbol2scm ("symbol"), get_music ()->get_property ("symbol"),
-		     ly_symbol2scm ("value"), get_music ()->get_property ("value"));
-  
-  Simple_music_iterator::process (m);
+  Context *o = get_outlet ();
+  Music *m = get_music ();
+  SCM previous_value = o->get_property (m->get_property ("symbol"));
+  send_stream_event (o, "SetProperty", m->origin (),
+                     ly_symbol2scm ("symbol"), m->get_property ("symbol"),
+                     ly_symbol2scm ("value"), m->get_property ("value"));
+
+  /* For \once \set install a finalization hook to reset the property to the
+   * previous value after the timestep */
+  if (to_boolean (m->get_property ("once")))
+    {
+      Global_context *tg = get_outlet ()->get_global_context ();
+      tg->add_finalization (scm_list_n (once_finalization_proc,
+                                        o->self_scm (), m->self_scm (),
+                                        ly_quote_scm (previous_value), SCM_UNDEFINED));
+    }
+
+  Simple_music_iterator::process (mom);
 }
 
 void
@@ -45,35 +58,30 @@ Property_unset_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
   send_stream_event (get_outlet (), "UnsetProperty", get_music ()->origin (),
-		     ly_symbol2scm ("symbol"), sym);
+                     ly_symbol2scm ("symbol"), sym);
 
   Simple_music_iterator::process (m);
 }
 
-MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 2);
+MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 3);
 SCM
-Property_iterator::once_finalization (SCM ctx, SCM music)
+Property_iterator::once_finalization (SCM ctx, SCM music, SCM previous_value)
 {
   Music *m = unsmob_music (music);
   Context *c = unsmob_context (ctx);
 
-  send_stream_event (c, "UnsetProperty", m->origin (),
-		     ly_symbol2scm ("symbol"), m->get_property ("symbol"));
+  // Do not use UnsetProperty, which sets the default, but rather
+  // cache the value before the \once \set command and restore it now
+  send_stream_event (c, "SetProperty", m->origin (),
+                     ly_symbol2scm ("symbol"), m->get_property ("symbol"),
+                     ly_symbol2scm ("value"), previous_value);
+
   return SCM_UNSPECIFIED;
 }
 
 void
 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));
-    }
 }
 
 bool
@@ -83,7 +91,7 @@ check_grob (Music *mus, SCM sym)
 
   if (!g)
     mus->origin ()->warning (_f ("not a grob name, `%s'",
-				 ly_symbol2string (sym)));
+                                 ly_symbol2string (sym)));
 
   return g;
 }
@@ -112,15 +120,15 @@ Push_property_iterator::process (Moment m)
       SCM val = get_music ()->get_property ("grob-value");
 
       if (to_boolean (get_music ()->get_property ("pop-first"))
-	  && !to_boolean (get_music ()->get_property ("once")))
-	send_stream_event (get_outlet (), "Revert", get_music ()->origin (),
-			   ly_symbol2scm ("symbol"), sym,
-			   ly_symbol2scm ("property-path"), grob_property_path);
-			
+          && !to_boolean (get_music ()->get_property ("once")))
+        send_stream_event (get_outlet (), "Revert", get_music ()->origin (),
+                           ly_symbol2scm ("symbol"), sym,
+                           ly_symbol2scm ("property-path"), grob_property_path);
+
       send_stream_event (get_outlet (), "Override", get_music ()->origin (),
-			 ly_symbol2scm ("symbol"), sym,
-			 ly_symbol2scm ("property-path"), grob_property_path,
-			 ly_symbol2scm ("value"), val);
+                         ly_symbol2scm ("symbol"), sym,
+                         ly_symbol2scm ("property-path"), grob_property_path,
+                         ly_symbol2scm ("value"), val);
     }
   Simple_music_iterator::process (m);
 }
@@ -138,8 +146,8 @@ Push_property_iterator::once_finalization (SCM ctx, SCM music)
       SCM grob_property_path = get_property_path (mus);
 
       send_stream_event (c, "Revert", mus->origin (),
-			 ly_symbol2scm ("symbol"), sym,
-			 ly_symbol2scm ("property-path"), grob_property_path);
+                         ly_symbol2scm ("symbol"), sym,
+                         ly_symbol2scm ("property-path"), grob_property_path);
     }
   return SCM_UNSPECIFIED;
 }
@@ -154,7 +162,7 @@ Push_property_iterator::do_quit ()
 
       Global_context *tg = get_outlet ()->get_global_context ();
       tg->add_finalization (scm_list_n (once_finalization_proc,
-					trans, music, SCM_UNDEFINED));
+                                        trans, music, SCM_UNDEFINED));
     }
 }
 
@@ -168,8 +176,8 @@ Pop_property_iterator::process (Moment m)
       SCM grob_property_path = get_property_path (get_music ());
 
       send_stream_event (get_outlet (), "Revert", get_music ()->origin (),
-			 ly_symbol2scm ("symbol"), sym,
-			 ly_symbol2scm ("property-path"), grob_property_path);
+                         ly_symbol2scm ("symbol"), sym,
+                         ly_symbol2scm ("property-path"), grob_property_path);
     }
   Simple_music_iterator::process (m);
 }