2003 -> 2004

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index b319c720895f7ce841c7ba5a83be9b49f07b9f95..82ce6d6673287ee8461a85d232436017eef31f8b 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,66 +3,71 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
 #include "translator-group.hh"
-#include "change-translator.hh"
-#include "debug.hh"
+#include "music.hh"
+#include "warn.hh"
+
 
 
 void
 Change_iterator::error (String reason)
 {
-  String to_type = change_l ()->change_to_type_str_;
-  String to_id =  change_l ()->change_to_id_str_;
+  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) 
+  String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id) 
     + ": " + reason;
-  String warn2= "Change_iterator::do_process_and_next (): " 
-    + report_to_l ()->type_str_ + " = `"
-    + report_to_l ()->id_str_ + "\': ";
-  warning (warn2);
-  change_l ()->warning (warn1);
-}
 
-Change_translator *
-Change_iterator::change_l ()
-{
-  return (Change_translator*) music_l_;
+  /*
+    GUHG!
+   */
+  String warn2= "Change_iterator::process (): " 
+    + get_outlet ()->context_name () + " = `"
+    + get_outlet ()->id_string_ + "': ";
+  warning (warn2);
+  get_music ()->origin ()->warning (warn1);
 }
 
 /*
   move to construct_children ?
  */
 void
-Change_iterator::do_process_and_next (Moment m)
+Change_iterator::process (Moment m)
 {
-  Translator_group * current = report_to_l ();
+  Translator_group * current = get_outlet ();
   Translator_group * last = 0;
 
-  String to_type = change_l ()->change_to_type_str_;
-  String to_id =  change_l ()->change_to_id_str_;
+  SCM to_type = get_music ()->get_mus_property ("change-to-type");
+  String to_id =  ly_scm2string (get_music ()->get_mus_property ("change-to-id"));
+
 
   /* find the type  of translator that we're changing.
      
      If \translator Staff = bass, then look for Staff = *
    */
-  while  (current && current->type_str_ != to_type)
+  while (current && !current->is_alias (to_type))
     {
       last = current;
-      current = current->daddy_trans_l_;
+      current = current->daddy_trans_;
+    }
+
+  if (current && current->id_string_ == to_id)
+    {
+      String msg;
+      msg += _ ("Can't switch translators, I'm there already");
     }
-  
   
   if (current) 
     if (last)
       {
        Translator_group * dest = 
-         report_to_l ()->find_create_translator_l (to_type, to_id);
-       current->remove_translator_p (last);
-       dest->add_translator (last);
+         get_outlet ()->find_create_translator (to_type, to_id, SCM_EOL);
+       current->remove_translator (last);
+       dest->add_used_group_translator (last);
       }
     else
       {
@@ -70,13 +75,16 @@ Change_iterator::do_process_and_next (Moment m)
          We could change the current translator's id, but that would make 
          errors hard to catch
          
-          last->translator_id_str_  = change_l ()->change_to_id_str_;
+          last->translator_id_string_  = get_change ()->change_to_id_string_;
        */
-       error ("I'm one myself");
+       error (_ ("I'm one myself"));
       }
   else
-    error ("None of these in my family.");
-  Music_iterator::do_process_and_next (m);
+    error (_ ("none of these in my family"));
+
+  Simple_music_iterator::process (m);
 }
 
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+
+
+IMPLEMENT_CTOR_CALLBACK (Change_iterator);