release commit

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

diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc
index 64698e441c743090400e129358d9307c83e56551..3f65471843a699db85e8376219e08c8482a1c7af 100644 (file)
--- a/lily/auto-change-iterator.cc
+++ b/lily/auto-change-iterator.cc
@@ -3,11 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1999--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "context.hh"
-#include "event.hh"
 #include "music-wrapper-iterator.hh"
 #include "direction.hh"
 
@@ -29,8 +28,8 @@ private:
   void change_to (Music_iterator *, SCM, String);
   Moment start_moment_;
 
-  Interpretation_context_handle up_;
-  Interpretation_context_handle down_;
+  Context_handle up_;
+  Context_handle down_;
 };
 
 void
@@ -59,7 +58,7 @@ Auto_change_iterator::change_to (Music_iterator *it, SCM to_type_sym,
   if (current && current->id_string () == to_id)
     {
       String msg;
-      msg += _ ("Can't switch translators, I'm there already");
+      msg += _f ("can't change, already in translator: %s", to_id);
     }
 
   if (current)
@@ -144,4 +143,5 @@ Auto_change_iterator::do_quit ()
   up_.set_context (0);
   down_.set_context (0);
 }
+
 IMPLEMENT_CTOR_CALLBACK (Auto_change_iterator);