X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fproperty-iterator.cc;h=5cf42864832323a144914237826d0288b8e66be6;hb=c77189ccaa4e645850ad61779de7a4c8f3fdbc6f;hp=a4c993b75644a943fa5ce77255385bf71793c367;hpb=b37e3f652677ae0298423db9fa0e552e5fce0c92;p=lilypond.git

diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc
index a4c993b756..5cf4286483 100644
--- a/lily/property-iterator.cc
+++ b/lily/property-iterator.cc
@@ -1,9 +1,20 @@
 /*
-  property-iterator.cc -- implement Property_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "property-iterator.hh"
@@ -22,16 +33,10 @@ bool check_grob (Music *mus, SCM sym);
 void
 Property_iterator::process (Moment m)
 {
-  SCM sym = get_music ()->get_property ("symbol");
-  if (scm_is_symbol (sym))
-    {
-      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)
-	get_outlet ()->internal_set_property (sym, val);
-    }
+  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);
 }
 
@@ -39,22 +44,21 @@ void
 Property_unset_iterator::process (Moment m)
 {
   SCM sym = get_music ()->get_property ("symbol");
-  type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?"));
-  get_outlet ()->unset_property (sym);
+  send_stream_event (get_outlet (), "UnsetProperty", get_music ()->origin (),
+		     ly_symbol2scm ("symbol"), sym);
 
   Simple_music_iterator::process (m);
 }
 
 MAKE_SCHEME_CALLBACK (Property_iterator, once_finalization, 2);
 SCM
-Property_iterator::once_finalization (SCM translator, SCM music)
+Property_iterator::once_finalization (SCM ctx, SCM music)
 {
   Music *m = unsmob_music (music);
-  Context *tg
-    = dynamic_cast<Context *> (unsmob_context (translator));
-  SCM sym = m->get_property ("symbol");
+  Context *c = unsmob_context (ctx);
 
-  tg->unset_property (sym);
+  send_stream_event (c, "UnsetProperty", m->origin (),
+		     ly_symbol2scm ("symbol"), m->get_property ("symbol"));
   return SCM_UNSPECIFIED;
 }
 
@@ -109,27 +113,33 @@ Push_property_iterator::process (Moment m)
 
       if (to_boolean (get_music ()->get_property ("pop-first"))
 	  && !to_boolean (get_music ()->get_property ("once")))
-	
-	execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED);
-
-      execute_general_pushpop_property (get_outlet (), sym, grob_property_path, val);
+	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);
     }
   Simple_music_iterator::process (m);
 }
 
 MAKE_SCHEME_CALLBACK (Push_property_iterator, once_finalization, 2);
 SCM
-Push_property_iterator::once_finalization (SCM trans, SCM music)
+Push_property_iterator::once_finalization (SCM ctx, SCM music)
 {
   Music *mus = unsmob_music (music);
-  Context *tg = dynamic_cast<Context *> (unsmob_context (trans));
+  Context *c = unsmob_context (ctx);
 
   SCM sym = mus->get_property ("symbol");
   if (check_grob (mus, sym))
     {
       SCM grob_property_path = get_property_path (mus);
 
-      execute_general_pushpop_property (tg, sym, grob_property_path, SCM_UNDEFINED);
+      send_stream_event (c, "Revert", mus->origin (),
+			 ly_symbol2scm ("symbol"), sym,
+			 ly_symbol2scm ("property-path"), grob_property_path);
     }
   return SCM_UNSPECIFIED;
 }
@@ -156,7 +166,10 @@ Pop_property_iterator::process (Moment m)
   if (check_grob (get_music (), sym))
     {
       SCM grob_property_path = get_property_path (get_music ());
-      execute_general_pushpop_property (get_outlet (), sym, grob_property_path, SCM_UNDEFINED);
+
+      send_stream_event (get_outlet (), "Revert", get_music ()->origin (),
+			 ly_symbol2scm ("symbol"), sym,
+			 ly_symbol2scm ("property-path"), grob_property_path);
     }
   Simple_music_iterator::process (m);
 }
@@ -165,4 +178,3 @@ IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Push_property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_iterator);
 IMPLEMENT_CTOR_CALLBACK (Property_unset_iterator);
-