X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchange-iterator.cc;h=698c9e8a4a6f424ad49cf2a2892628982b37340e;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=681ac2ae0fd48c419b84f23d6c4fa51f48987d4d;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 681ac2ae0f..698c9e8a4a 100644
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,79 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "change-iterator.hh"
-#include "translator-group.hh"
-#include "change-translator.hh"
-#include "debug.hh"
 
-Change_iterator::Change_iterator (Change_translator *change_l)
-{
-  change_l_ = change_l;
-}
+#include "context.hh"
+#include "input.hh"
+#include "international.hh"
+#include "music.hh"
+#include "warn.hh"
 
 void
-Change_iterator::error (String reason)
+Change_iterator::error (string reason)
 {
-  String to_type = change_l_->change_to_type_str_;
-  String to_id =  change_l_->change_to_id_str_;
-
-  String warn1 = 
-    _ ("Can't change ") + to_type 
-    + _(" to ") + "`" + to_id + "\': " + reason;
-  String warn2= "Change_iterator::process_and_next (): " + report_to_l ()->type_str_ + " = `"
-    + report_to_l ()->id_str_ + "\': ";
+  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 ("cannot change `%s' to `%s'", to_type, to_id)
+    + ": " + reason;
+
+  /*
+    GUHG!
+  */
+  string warn2= "Change_iterator::process (): "
+    + get_outlet ()->context_name () + " = `"
+    + get_outlet ()->id_string () + "': ";
   warning (warn2);
-  change_l_->warning (warn1);
+  get_music ()->origin ()->warning (warn1);
 }
 
 /*
   move to construct_children ?
- */
+*/
 void
-Change_iterator::process_and_next (Moment m)
+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 = change_l_->change_to_type_str_;
-  String to_id =  change_l_->change_to_id_str_;
+  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)
+
+  If \translator Staff = bass, then look for Staff = *
+  */
+  while (current && !current->is_alias (to_type))
     {
       last = current;
-      current = current->daddy_trans_l_;
+      current = current->get_parent_context ();
     }
-  
-  
-  if (current) 
+
+  if (current && current->id_string () == to_id)
+    {
+      string msg;
+      msg += _f ("cannot change, already in translator: %s", to_id);
+    }
+
+  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 (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_str_  = change_l_->change_to_id_str_;
-	*/
-	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
-    error ("None of these in my family.");
-  Music_iterator::process_and_next (m);
+    /* FIXME: uncomprehensable message */
+    error (_ ("none of these in my family"));
+
+  Simple_music_iterator::process (m);
 }
 
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+IMPLEMENT_CTOR_CALLBACK (Change_iterator);