X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=04647c111c0aed8f783cf2519daf93be6aed7e1b;hb=941dff9d2a67080e0dd8474f1e70f0c72ace6424;hp=804e3ff6e3887aae772539cc7dc284b03a2c5adb;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 804e3ff6e3..04647c111c 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -1,90 +1,111 @@
 /*
-  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--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.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"
+
 #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_ + "': ";
+    + get_outlet ()->id_string () + "': ";
   warning (warn2);
   get_music ()->origin ()->warning (warn1);
 }
 
 /*
   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;
-      current = current->daddy_context_;
+      current = current->get_parent_context ();
     }
 
-  if (current && current->id_string_ == to_id)
+  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 = 
-	  get_outlet ()->find_create_context (to_type, to_id, SCM_EOL);
-	current->remove_context (last);
-	dest->add_context (last);
+	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)
+	  {
+	    send_stream_event (last, "ChangeParent", get_music ()->origin (),
+			       ly_symbol2scm ("context"), dest->self_scm ());
+	  }
+	else
+	  /* 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);