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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 43631687c8..7f298ac444 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -1,9 +1,20 @@
 /*
-  change-iterator.cc -- implement Change_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--2005 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 "change-iterator.hh"
@@ -20,7 +31,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 +69,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 +85,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 +99,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 */