Run grand-replace (issue 3765)

[lilypond.git] / lily / auto-change-iterator.cc

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 31d75f0f1c4262b8c650589737a5088378c20a5a..9dcd9993bc193b9d81d6e1fb9eafa05d7b3e1b02 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -1,14 +1,26 @@
 /*
-  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@xs4all.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 "direction.hh"
 #include "international.hh"
+#include "music.hh"
 #include "music-wrapper-iterator.hh"
 
 class Auto_change_iterator : public Music_wrapper_iterator
@@ -22,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, std::string);
+  void change_to (Music_iterator *, SCM, const string&);
   Moment start_moment_;
 
   Context_handle up_;
@@ -35,7 +47,7 @@ private:
 
 void
 Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
-                                std::string to_id)
+                                 const string &to_id)
 {
   Context *current = it->get_outlet ();
   Context *last = 0;
@@ -58,27 +70,30 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
 
   if (current && current->id_string () == to_id)
     {
-      std::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
@@ -88,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_));
       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;
-         std::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);
+        }
     }
 }
 
@@ -123,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 ();
 }