X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=04ed126556cc7b53d8620a13e47da5bbeeccd6db;hb=a6983ea69327355a25d0b3f0bfc568267896432c;hp=1fb472a1b5a45905c1201166455c2fdec307c12f;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 1fb472a1b5..04ed126556 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,13 +3,14 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
-#include "event.hh"
-#include "music-wrapper-iterator.hh"
 #include "direction.hh"
+#include "international.hh"
+#include "music.hh"
+#include "music-wrapper-iterator.hh"
 
 class Auto_change_iterator : public Music_wrapper_iterator
 {
@@ -22,21 +23,20 @@ protected:
   virtual void do_quit ();
   virtual void construct_children ();
   virtual void process (Moment);
-  Array<Pitch> pending_pitch (Moment) const;
+  vector<Pitch> pending_pitch (Moment) const;
 private:
   SCM split_list_;
   Direction where_dir_;
-  void change_to (Music_iterator *, SCM, String);
+  void change_to (Music_iterator *, SCM, string);
   Moment start_moment_;
 
-  Interpretation_context_handle up_;
-  Interpretation_context_handle down_;
-
+  Context_handle up_;
+  Context_handle down_;
 };
 
 void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-				 String to_id)
+				 string to_id)
 {
   Context *current = it->get_outlet ();
   Context *last = 0;
@@ -59,28 +59,30 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
 
   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 (last)
-      {
-	Context *dest
-	  = it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
-	current->remove_context (last);
-	dest->add_context (last);
-      }
-    else
-      {
-	/*
-	  We could change the current translator's id, but that would make
-	  errors hard to catch
-
-	*/
-      }
-  else;
+    {
+      if (last)
+	{
+	  Context *dest
+	    = it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
+	  
+	  send_stream_event (last, "ChangeParent", get_music ()->origin (),
+			       ly_symbol2scm ("context"), dest->self_scm ());
+	}
+      else
+	{
+	  /*
+	    We could change the current translator's id, but that would make
+	    errors hard to catch
 
+	  */
+	  ;
+	}
+    }
 }
 
 void
@@ -90,6 +92,8 @@ Auto_change_iterator::process (Moment m)
 
   Moment now = get_outlet ()->now_mom ();
   Moment *splitm = 0;
+  if (start_moment_.main_part_.is_infinity () && start_moment_ < 0)
+    start_moment_ = now;
 
   for (; scm_is_pair (split_list_); split_list_ = scm_cdr (split_list_))
     {
@@ -103,7 +107,7 @@ Auto_change_iterator::process (Moment m)
       if (d && d != where_dir_)
 	{
 	  where_dir_ = d;
-	  String to_id = (d >= 0) ? "up" : "down";
+	  string to_id = (d >= 0) ? "up" : "down";
 	  change_to (child_iter_,
 		     ly_symbol2scm ("Staff"),
 		     to_id);
@@ -138,7 +142,6 @@ Auto_change_iterator::construct_children ()
 					    "", SCM_EOL);
   set_context (voice);
   Music_wrapper_iterator::construct_children ();
-
 }
 
 void
@@ -146,6 +149,6 @@ Auto_change_iterator::do_quit ()
 {
   up_.set_context (0);
   down_.set_context (0);
-
 }
+
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);