* lily/ various: Introduce stream events of types Prepare,

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index f5c54f224ce37f508faa70e3a905c7d87a592b70..ade8303e0d75a5cdc639799fa58bcee6d617b541 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -68,8 +68,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 +91,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_))
     {