2003 -> 2004

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index b8ccb356b1cf904fa1129be1b3055db7bde53c94..82ce6d6673287ee8461a85d232436017eef31f8b 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
@@ -16,8 +16,8 @@
 void
 Change_iterator::error (String reason)
 {
-  String to_type = ly_scm2string (get_music ()->get_mus_property ("change-to-type"));
-  String to_id =  ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
+  String to_type = ly_symbol2string (get_music ()->get_mus_property ("change-to-type"));
+  String to_id = ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
 
   String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id) 
     + ": " + reason;
@@ -26,8 +26,8 @@ Change_iterator::error (String reason)
     GUHG!
    */
   String warn2= "Change_iterator::process (): " 
-    + report_to ()->context_name () + " = `"
-    + report_to ()->id_string_ + "': ";
+    + get_outlet ()->context_name () + " = `"
+    + get_outlet ()->id_string_ + "': ";
   warning (warn2);
   get_music ()->origin ()->warning (warn1);
 }
@@ -38,7 +38,7 @@ Change_iterator::error (String reason)
 void
 Change_iterator::process (Moment m)
 {
-  Translator_group * current = report_to ();
+  Translator_group * current = get_outlet ();
   Translator_group * last = 0;
 
   SCM to_type = get_music ()->get_mus_property ("change-to-type");
@@ -49,7 +49,7 @@ Change_iterator::process (Moment m)
      
      If \translator Staff = bass, then look for Staff = *
    */
-  while (current && !current->is_alias_b (to_type))
+  while (current && !current->is_alias (to_type))
     {
       last = current;
       current = current->daddy_trans_;
@@ -65,7 +65,7 @@ Change_iterator::process (Moment m)
     if (last)
       {
        Translator_group * dest = 
-         report_to ()->find_create_translator (to_type, to_id);
+         get_outlet ()->find_create_translator (to_type, to_id, SCM_EOL);
        current->remove_translator (last);
        dest->add_used_group_translator (last);
       }
@@ -81,6 +81,7 @@ Change_iterator::process (Moment m)
       }
   else
     error (_ ("none of these in my family"));
+
   Simple_music_iterator::process (m);
 }