X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=46d9fb035dbc2d7b3af965c2c84bfba9e1f53185;hb=334f5a4b1a756eaa161b230bc799651152044fd8;hp=fcfd2fc1f45cfe31923730b7d957eb49b5dde9dc;hpb=8b500afb9431f5471e385fa2eeb8fde868e4fc49;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index fcfd2fc1f4..46d9fb035d 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -1,18 +1,28 @@
 /*
-  music-iterator.cc -- implement Music_iterator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
 
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#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 +128,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 +155,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;
@@ -165,8 +175,11 @@ Music_iterator::report_event (Music *m)
 {
   descend_to_bottom_context ();
 
+  /*
+    FIXME: then don't do it. 
+  */
   if (!m->is_mus_type ("event"))
-    m->origin ()->warning (_f ("Sending non-event to context"));
+    m->origin ()->programming_error (_ ("Sending non-event to context"));
 
   m->send_to_context (get_outlet ());
 }