X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=698c9e8a4a6f424ad49cf2a2892628982b37340e;hb=bbaf60edda2d5dd759050c1046cbd9865f3affbd;hp=d36567b5940981cf5ee0dd2babbfcb8b4fce4060;hpb=a2b1b52453dfc35fd3faf16835e18675bd2b2b7f;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index d36567b594..698c9e8a4a 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2009 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 ("cannot 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);
@@ -34,21 +35,20 @@ Change_iterator::error (String reason)
 
 /*
   move to construct_children ?
- */
+*/
 void
 Change_iterator::process (Moment m)
 {
-  Context * current = get_outlet ();
-  Context * last = 0;
+  Context *current = get_outlet ();
+  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.
-     
-     If \translator Staff = bass, then look for Staff = *
-   */
+
+  If \translator Staff = bass, then look for Staff = *
+  */
   while (current && !current->is_alias (to_type))
     {
       last = current;
@@ -57,47 +57,44 @@ 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 ("cannot change, already in translator: %s", to_id);
     }
-  
-  if (current) 
+
+  if (current)
     if (last)
       {
-	Context * dest = 0;
-	Context * where = get_outlet ();
+	Context *dest = 0;
+	Context *where = get_outlet ();
 	while (!dest && where)
 	  {
 	    dest = find_context_below (where, to_type, to_id);
 	    where = where->get_parent_context ();
 	  }
-	
+
 	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 (_ ("cannot find context to switch to"));
       }
     else
       {
-	/*
-	  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"));
+	/* 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 (_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);
 }
 
-
-
 IMPLEMENT_CTOR_CALLBACK (Change_iterator);