patch::: 1.3.45.jcn1

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

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 9d9bf43af76f19ddb5e4627763d3af1fcc4b2695..f860c6977349ff9b3235345069729021e6cf04b5 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--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "change-iterator.hh"
@@ -19,11 +19,14 @@ Change_iterator::error (String reason)
   String to_type = t->change_to_type_str_;
   String to_id =  t->change_to_id_str_;
 
-  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;
+  /*
+    GUHG!
+   */
   String warn2= "Change_iterator::do_process_and_next (): " 
     + report_to_l ()->type_str_ + " = `"
-    + report_to_l ()->id_str_ + "\': ";
+    + report_to_l ()->id_str_ + "': ";
   warning (warn2);
   t->warning (warn1);
 }
@@ -50,7 +53,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)
@@ -68,10 +76,10 @@ 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.");
+    error (_ ("none of these in my family"));
   Music_iterator::do_process_and_next (m);
 }