patch::: 1.3.115.jcn2

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 028d19f69fe65d1583ca739ef4bb14974454d437..3bf8101690301228e73bc3ab7727378678f872d3 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -3,43 +3,45 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
 #include "translator-group.hh"
-#include "change-translator.hh"
+#include "music.hh"
 #include "debug.hh"
 
 
 void
 Change_iterator::error (String reason)
 {
-  Change_translator const * t = dynamic_cast<Change_translator const*> (music_l_);   
-  String to_type = t->change_to_type_str_;
-  String to_id =  t->change_to_id_str_;
+  String to_type = ly_scm2string (music_l_->get_mus_property ("change-to-type"));
+  String to_id =  ly_scm2string (music_l_->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 (): " 
+  /*
+    GUHG!
+   */
+  String warn2= "Change_iterator::process (): " 
     + report_to_l ()->type_str_ + " = `"
-    + report_to_l ()->id_str_ + "\': ";
+    + report_to_l ()->id_str_ + "': ";
   warning (warn2);
-  t->warning (warn1);
+  music_l_->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 * last = 0;
 
-  Change_translator const * t = dynamic_cast<Change_translator const*> (music_l_); 
-  String to_type = t->change_to_type_str_;
-  String to_id =  t->change_to_id_str_;
+  String to_type = ly_scm2string (music_l_->get_mus_property ("change-to-type"));
+  String to_id =  ly_scm2string (music_l_->get_mus_property ("change-to-id"));
+
 
   /* find the type  of translator that we're changing.
      
@@ -50,7 +52,12 @@ Change_iterator::do_process_and_next (Moment m)
       last = current;
       current = current->daddy_trans_l_;
     }
-  
+
+  if (current && current->id_str_ == to_id)
+    {
+      String msg;
+      msg += _ ("Can't switch translators, I'm there already");
+    }
   
   if (current) 
     if (last)
@@ -58,7 +65,7 @@ Change_iterator::do_process_and_next (Moment m)
        Translator_group * dest = 
          report_to_l ()->find_create_translator_l (to_type, to_id);
        current->remove_translator_p (last);
-       dest->add_translator (last);
+       dest->add_group_translator (last);
       }
     else
       {
@@ -68,11 +75,13 @@ Change_iterator::do_process_and_next (Moment m)
          
           last->translator_id_str_  = change_l ()->change_to_id_str_;
        */
-       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_CTOR_CALLBACK(Change_iterator);