Run `make grand-replace'.

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

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 83838427df32aac99a381dd0b2f157bff6b6faaa..99972ab6d607abdef5a3a2af92b497851012a918 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -3,16 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 
-#include "music-iterator.hh"
-
 #include <cstdio>
 using namespace std;
 
 #include "warn.hh"
+#include "music.hh"
 #include "context.hh"
 #include "event-iterator.hh"
 #include "input.hh"
@@ -118,7 +117,7 @@ Music_iterator::music_start_mom ()const
 }
 
 void
-Music_iterator::init_translator (Music *m, Context *report)
+Music_iterator::init_context (Music *m, Context *report)
 {
   music_ = m;
   assert (m);
@@ -145,7 +144,7 @@ Music_iterator::get_iterator (Music *m) const
   SCM ip = get_static_get_iterator (m);
   Music_iterator *p = unsmob_iterator (ip);
 
-  p->init_translator (m, get_outlet ());
+  p->init_context (m, get_outlet ());
 
   p->construct_children ();
   return ip;
@@ -169,7 +168,7 @@ Music_iterator::report_event (Music *m)
     FIXME: then don't do it. 
   */
   if (!m->is_mus_type ("event"))
-    m->origin ()->programming_error (_f ("Sending non-event to context"));
+    m->origin ()->programming_error (_ ("Sending non-event to context"));
 
   m->send_to_context (get_outlet ());
 }