patch::: 1.1.27.jcn4: jcn4

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 883e963e9f3d29b00a62c96f353c5bddd8fa5b6d..81352999e6ebb84cc354e1138a07c02f9c437045 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 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
@@ -11,37 +11,39 @@
 #include "change-translator.hh"
 #include "debug.hh"
 
-Change_iterator::Change_iterator (Change_translator *change_l)
-{
-  change_l_ = change_l;
-}
 
 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 = change_l ()->change_to_type_str_;
+  String to_id =  change_l ()->change_to_id_str_;
 
-  String warn1 = 
-    _ ("Can't change ") + to_type 
-    + _(" to ") + "`" + to_id + "\': " + reason;
-  String warn2= "Change_iterator::process_and_next (): " + report_to_l ()->type_str_ + " = `"
+  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_l ()->warning (warn1);
+}
+
+Change_translator *
+Change_iterator::change_l ()
+{
+  return (Change_translator*) music_l_;
 }
 
 /*
   move to construct_children ?
  */
 void
-Change_iterator::process_and_next (Moment m)
+Change_iterator::do_process_and_next (Moment m)
 {
   Translator_group * current = report_to_l ();
   Translator_group * last = 0;
 
-  String to_type = change_l_->change_to_type_str_;
-  String to_id =  change_l_->change_to_id_str_;
+  String to_type = change_l ()->change_to_type_str_;
+  String to_id =  change_l ()->change_to_id_str_;
 
   /* find the type  of translator that we're changing.
      
@@ -60,22 +62,21 @@ Change_iterator::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 (last);
+       dest->add_translator (last);
       }
     else
       {
-       
        /*
          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_str_  = change_l ()->change_to_id_str_;
        */
        error ("I'm one myself");
       }
   else
     error ("None of these in my family.");
-  Music_iterator::process_and_next (m);
+  Music_iterator::do_process_and_next (m);
 }
 
-IMPLEMENT_IS_TYPE_B1 (Change_iterator, Music_iterator);
+