X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=698c9e8a4a6f424ad49cf2a2892628982b37340e;hb=6313f2575553aefbef5b98742a52b7dbe2d4a2a9;hp=aef7567be0f74e1390b96c55e3b0438b6525b3ba;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index aef7567be0..698c9e8a4a 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "change-iterator.hh"
@@ -20,7 +20,7 @@ Change_iterator::error (string reason)
   string to_type = ly_symbol2string (get_music ()->get_property ("change-to-type"));
   string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
 
-  string warn1 = _f ("can't change `%s' to `%s'", to_type, to_id)
+  string warn1 = _f ("cannot change `%s' to `%s'", to_type, to_id)
     + ": " + reason;
 
   /*
@@ -58,7 +58,7 @@ Change_iterator::process (Moment m)
   if (current && current->id_string () == to_id)
     {
       string msg;
-      msg += _f ("can't change, already in translator: %s", to_id);
+      msg += _f ("cannot change, already in translator: %s", to_id);
     }
 
   if (current)
@@ -74,12 +74,12 @@ Change_iterator::process (Moment m)
 
 	if (dest)
 	  {
-	    current->remove_context (last);
-	    dest->add_context (last);
+	    send_stream_event (last, "ChangeParent", get_music ()->origin (),
+			       ly_symbol2scm ("context"), dest->self_scm ());
 	  }
 	else
 	  /* FIXME: constant error message.  */
-	  get_music ()->origin ()->warning (_ ("can't find context to switch to"));
+	  get_music ()->origin ()->warning (_ ("cannot find context to switch to"));
       }
     else
       {