X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=c076b7ad65867e9e9b3cdb9266ae0748c1dd7586;hb=ac1f5ee6bc66e39e4fec27434ebb7c7300bab71e;hp=036a0c324945341182b4c4a04b2a6043e17b8b8d;hpb=abbdb46061be5c0a0682059d1f86bf3e44ca5cf3;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 036a0c3249..c076b7ad65 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -1,18 +1,27 @@
 /*
-  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--2012 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.
 
-#include "music-iterator.hh"
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 #include <cstdio>
 using namespace std;
 
 #include "warn.hh"
+#include "music.hh"
 #include "context.hh"
 #include "event-iterator.hh"
 #include "input.hh"
@@ -41,7 +50,7 @@ Music_iterator::~Music_iterator ()
 Context *
 Music_iterator::get_outlet () const
 {
-  return handle_.get_outlet ();
+  return handle_.get_context ();
 }
 
 void
@@ -87,11 +96,11 @@ Music_iterator::get_static_get_iterator (Music *m)
   else
     {
       if (dynamic_cast<Music_wrapper *> (m))
-	p = new Music_wrapper_iterator;
+        p = new Music_wrapper_iterator;
       else if (m->is_mus_type ("event"))
         p = new Event_iterator;
       else
-	p = new Simple_music_iterator;
+        p = new Simple_music_iterator;
 
       iter = p->self_scm ();
       p->unprotect ();
@@ -160,16 +169,16 @@ Music_iterator::descend_to_bottom_context ()
     set_context (get_outlet ()->get_default_interpreter ());
 }
 
-void 
+void
 Music_iterator::report_event (Music *m)
 {
   descend_to_bottom_context ();
 
   /*
-    FIXME: then don't do it. 
+    FIXME: then don't do it.
   */
   if (!m->is_mus_type ("event"))
-    m->origin ()->programming_error (_ ("Sending non-event to context"));
+    m->origin ()->programming_error ("Sending non-event to context");
 
   m->send_to_context (get_outlet ());
 }
@@ -207,7 +216,7 @@ Music_iterator::mark_smob (SCM smob)
 }
 
 int
-Music_iterator::print_smob (SCM sm, SCM port, scm_print_state*)
+Music_iterator::print_smob (SCM sm, SCM port, scm_print_state *)
 {
   char s[1000];