X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=55099a855e4552cdeec205cad488e6ce86c33125;hb=897b3ba501c80ccf0d1fc4e65c70a9dc979c3e12;hp=5a71519e5f62ac2413054d7bb2633ebcb2258f53;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 5a71519e5f..55099a855e 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,29 +3,30 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "change-iterator.hh"
 
 #include "context.hh"
+#include "input.hh"
+#include "international.hh"
 #include "music.hh"
 #include "warn.hh"
-#include "input.hh"
 
 void
-Change_iterator::error (String reason)
+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 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 ("can't change `%s' to `%s'", to_type, to_id)
     + ": " + reason;
 
   /*
     GUHG!
   */
-  String warn2= "Change_iterator::process (): "
+  string warn2= "Change_iterator::process (): "
     + get_outlet ()->context_name () + " = `"
     + get_outlet ()->id_string () + "': ";
   warning (warn2);
@@ -42,7 +43,7 @@ Change_iterator::process (Moment m)
   Context *last = 0;
 
   SCM to_type = get_music ()->get_property ("change-to-type");
-  String to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
+  string to_id = ly_scm2string (get_music ()->get_property ("change-to-id"));
 
   /* find the type  of translator that we're changing.
 
@@ -56,8 +57,8 @@ Change_iterator::process (Moment m)
 
   if (current && current->id_string () == to_id)
     {
-      String msg;
-      msg += _ ("Can't switch translators, I'm there already");
+      string msg;
+      msg += _f ("can't change, already in translator: %s", to_id);
     }
 
   if (current)
@@ -73,25 +74,24 @@ 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
-	  {
-	    get_music ()->origin ()->warning ("could not find context to switch to.");
-	  }
+	  /* FIXME: constant error message.  */
+	  get_music ()->origin ()->warning (_ ("can't find context to switch to"));
       }
     else
       {
-	/*
-	  We could change the current translator's id, but that would make
-	  errors hard to catch
+	/* We could change the current translator's id, but that would make
+	   errors hard to catch.
 
-	  last->translator_id_string ()  = get_change ()->change_to_id_string ();
-	*/
-	error (_ ("I'm one myself"));
+	   last->translator_id_string () = get_change
+	   ()->change_to_id_string (); */
+	error (_f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ()));
       }
   else
+    /* FIXME: uncomprehensable message */
     error (_ ("none of these in my family"));
 
   Simple_music_iterator::process (m);