Don't crash for tremolo beams.

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index f5c54f224ce37f508faa70e3a905c7d87a592b70..76e43dbccdf4918175df9a7ef73b27f8bff736fb 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--2011 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
@@ -59,7 +71,7 @@ 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);
+      msg += _f ("cannot change, already in translator: %s", to_id);
     }
 
   if (current)
@@ -68,8 +80,9 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
        {
          Context *dest
            = it->get_outlet ()->find_create_context (to_type_sym, to_id, SCM_EOL);
-         current->remove_context (last);
-         dest->add_context (last);
+         
+         send_stream_event (last, "ChangeParent", get_music ()->origin (),
+                              ly_symbol2scm ("context"), dest->self_scm ());
        }
       else
        {
@@ -90,6 +103,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_))
     {