X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=2a4f52751bbe97523210740d46104259658efc68;hb=b1e87575d7dbce73e74c7e6eb1b64dbfc82e65a4;hp=0060d4a0adff28402e50ddacdfba135b1bddebba;hpb=e37010af17faa8b185de836664b6544bd29dc1d0;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 0060d4a0ad..2a4f52751b 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,88 +3,97 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
+
 #include "context.hh"
 #include "music.hh"
 #include "warn.hh"
 #include "input.hh"
 
-
 void
 Change_iterator::error (String reason)
 {
-  String to_type = ly_symbol2string (get_music ()->get_mus_property ("change-to-type"));
-  String to_id = ly_scm2string (get_music ()->get_mus_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_ + "': ";
+    + 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;
-
-  SCM to_type = get_music ()->get_mus_property ("change-to-type");
-  String to_id =  ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
+  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"));
 
   /* 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");
+      msg += _f ("can't 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)
+	  {
+	    current->remove_context (last);
+	    dest->add_context (last);
+	  }
+	else
+	  /* 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
-	  
-	   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", to_type));
       }
   else
+    /* FIXME: uncomprehensable message */
     error (_ ("none of these in my family"));
 
   Simple_music_iterator::process (m);
 }
 
-
-
 IMPLEMENT_CTOR_CALLBACK (Change_iterator);