X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fauto-change-iterator.cc;h=4559344fd8448d558a2ba9b895176ee290c57951;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=e88692123a70932c0728a45a4fd4c99112329a9a;hpb=17a0be44b562c72ccfebf2bef4a7a6fcc07bd02f;p=lilypond.git

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index e88692123a..4559344fd8 100644
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -1,14 +1,27 @@
 /*
-  auto-change-iterator.cc -- implement  Auto_change_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 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 "context.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
 {
@@ -21,11 +34,11 @@ 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, const string&);
   Moment start_moment_;
 
   Context_handle up_;
@@ -34,7 +47,7 @@ private:
 
 void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-				 String to_id)
+                                 const string &to_id)
 {
   Context *current = it->get_outlet ();
   Context *last = 0;
@@ -57,27 +70,30 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
 
   if (current && current->id_string () == to_id)
     {
-      String msg;
-      msg += _f ("can't change, already in translator: %s", to_id);
+      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
@@ -87,24 +103,26 @@ 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_))
     {
-      splitm = unsmob_moment (scm_caar (split_list_));
+      splitm = Moment::unsmob (scm_caar (split_list_));
       if ((*splitm + start_moment_) > now)
-	break;
+        break;
 
       SCM tag = scm_cdar (split_list_);
       Direction d = to_dir (tag);
 
       if (d && d != where_dir_)
-	{
-	  where_dir_ = d;
-	  String to_id = (d >= 0) ? "up" : "down";
-	  change_to (child_iter_,
-		     ly_symbol2scm ("Staff"),
-		     to_id);
-	}
+        {
+          where_dir_ = d;
+          string to_id = (d >= 0) ? "up" : "down";
+          change_to (child_iter_,
+                     ly_symbol2scm ("Staff"),
+                     to_id);
+        }
     }
 }
 
@@ -122,17 +140,17 @@ Auto_change_iterator::construct_children ()
 
   SCM props = get_outlet ()->get_property ("trebleStaffProperties");
   Context *up = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"),
-						    "up", props);
+                                                    "up", props);
 
   props = get_outlet ()->get_property ("bassStaffProperties");
   Context *down = get_outlet ()->find_create_context (ly_symbol2scm ("Staff"),
-						      "down", props);
+                                                      "down", props);
 
   up_.set_context (up);
   down_.set_context (down);
 
   Context *voice = up->find_create_context (ly_symbol2scm ("Voice"),
-					    "", SCM_EOL);
+                                            "", SCM_EOL);
   set_context (voice);
   Music_wrapper_iterator::construct_children ();
 }