patch::: 1.5.17.jcn2

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index c6ebf2907f41548c37853df1d4a1341a08cdbc16..727cb9b681804bff75be9a519e9b355867944514 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -1,43 +1,87 @@
 /*
-  change-iterator.cc -- implement 
+  change-iterator.cc -- implement Change_iterator
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+  (c)  1997--2001 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"
 
-Change_iterator::Change_iterator (Change_translator *change_l)
+
+void
+Change_iterator::error (String reason)
 {
-  change_l_ = change_l;
+  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) 
+    + ": " + reason;
+  /*
+    GUHG!
+   */
+  String warn2= "Change_iterator::process (): " 
+    + report_to_l ()->type_str_ + " = `"
+    + report_to_l ()->id_str_ + "': ";
+  warning (warn2);
+  music_l ()->origin ()->warning (warn1);
 }
 
 /*
   move to construct_children ?
  */
 void
-Change_iterator::process_and_next (Moment m)
+Change_iterator::process (Moment m)
 {
   Translator_group * current = report_to_l ();
   Translator_group * last = 0;
-  while  (current && current->type_str_ != change_l_->change_to_type_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.
+     
+     If \translator Staff = bass, then look for Staff = *
+   */
+  while (current && current->type_str_ != to_type)
     {
       last = current;
       current = current->daddy_trans_l_;
     }
-  if (current) 
+
+  if (current && current->id_str_ == to_id)
     {
-      Translator_group * dest = 
-       report_to_l ()->find_create_translator_l (change_l_->change_to_type_str_, 
-                                                 change_l_->change_to_id_str_);
-      current->remove_translator_p (last);
-      dest->add (last);
+      String msg;
+      msg += _ ("Can't switch translators, I'm there already");
     }
   
-  Music_iterator::process_and_next (m);
+  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_group_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_;
+       */
+       error (_ ("I'm one myself"));
+      }
+  else
+    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);