X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=8b8f191006f90e4470d3c84831632fa7965b39d8;hb=af770f3440264c18ce01525dce1aa76b86ace0d5;hp=43631687c88c5594d580cde15daeee852b710955;hpb=31568c504806f35aac420a394c9eab07abd9faa7;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 43631687c8..8b8f191006 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -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
       {
@@ -88,7 +88,7 @@ Change_iterator::process (Moment m)
 
 	   last->translator_id_string () = get_change
 	   ()->change_to_id_string (); */
-	error (_f ("not changing to same context type: %s", to_type));
+	error (_f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ()));
       }
   else
     /* FIXME: uncomprehensable message */