coding style nits; more accurate programming_error for introducing infinity.

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 43631687c88c5594d580cde15daeee852b710955..55099a855e4552cdeec205cad488e6ce86c33125 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -74,8 +74,8 @@ Change_iterator::process (Moment m)
 
        if (dest)
          {
-           current->remove_context (last);
-           dest->add_context (last);
+           send_stream_event (last, "ChangeParent", get_music ()->origin (),
+                              ly_symbol2scm ("context"), dest->self_scm ());
          }
        else
          /* FIXME: constant error message.  */
@@ -88,7 +88,7 @@ Change_iterator::process (Moment m)
 
           last->translator_id_string () = get_change
           ()->change_to_id_string (); */
-       error (_f ("not changing to same context type: %s", to_type));
+       error (_f ("not changing to same context type: %s", ly_symbol2string (to_type).c_str ()));
       }
   else
     /* FIXME: uncomprehensable message */