X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=5099f8bdf62ed70dc572021a26e8d6dff622cb78;hb=ca20eaa74e7e762c0611de26cc2267909ae27e02;hp=727cb9b681804bff75be9a519e9b355867944514;hpb=4995fea559cd5399b4f462de546a15195d76f4c3;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 727cb9b681..5099f8bdf6 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,31 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
-#include "translator-group.hh"
-#include "music.hh"
-#include "debug.hh"
 
+#include "context.hh"
+#include "music.hh"
+#include "warn.hh"
+#include "input.hh"
 
 void
 Change_iterator::error (String reason)
 {
-  String to_type = ly_scm2string (music_l ()->get_mus_property ("change-to-type"));
-  String to_id =  ly_scm2string (music_l ()->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) 
     + ": " + reason;
+
   /*
     GUHG!
    */
   String warn2= "Change_iterator::process (): " 
-    + report_to_l ()->type_str_ + " = `"
-    + report_to_l ()->id_str_ + "': ";
+    + get_outlet ()->context_name () + " = `"
+    + get_outlet ()->id_string () + "': ";
   warning (warn2);
-  music_l ()->origin ()->warning (warn1);
+  get_music ()->origin ()->warning (warn1);
 }
 
 /*
@@ -36,24 +38,24 @@ Change_iterator::error (String reason)
 void
 Change_iterator::process (Moment m)
 {
-  Translator_group * current = report_to_l ();
-  Translator_group * last = 0;
+  Context * current = get_outlet ();
+  Context * last = 0;
 
-  String to_type = ly_scm2string (music_l ()->get_mus_property ("change-to-type"));
-  String to_id =  ly_scm2string (music_l ()->get_mus_property ("change-to-id"));
+  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 = *
    */
-  while (current && current->type_str_ != to_type)
+  while (current && !current->is_alias (to_type))
     {
       last = current;
-      current = current->daddy_trans_l_;
+      current = current->get_parent_context ();
     }
 
-  if (current && current->id_str_ == to_id)
+  if (current && current->id_string () == to_id)
     {
       String msg;
       msg += _ ("Can't switch translators, I'm there already");
@@ -62,10 +64,23 @@ Change_iterator::process (Moment m)
   if (current) 
     if (last)
       {
-	Translator_group * dest = 
-	  report_to_l ()->find_create_translator_l (to_type, to_id);
-	current->remove_translator_p (last);
-	dest->add_group_translator (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
+	  {
+	    get_music ()->origin ()->warning  ("could not find context to switch to.");
+	  }
       }
     else
       {
@@ -73,12 +88,13 @@ Change_iterator::process (Moment m)
 	  We could change the current translator's id, but that would make 
 	  errors hard to catch
 	  
-	   last->translator_id_str_  = change_l ()->change_to_id_str_;
+	   last->translator_id_string ()  = get_change ()->change_to_id_string ();
 	*/
 	error (_ ("I'm one myself"));
       }
   else
     error (_ ("none of these in my family"));
+
   Simple_music_iterator::process (m);
 }