X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fapply-context-iterator.cc;h=ce3fd032e26e3c12b6ab7e9bdc3e47e87a6d6551;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=3b42c54fcb081e2df06ffd010dff030e11ba4a99;hpb=98153531a06b6afa43303e12e5289867dc84c39e;p=lilypond.git

diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index 3b42c54fcb..ce3fd032e2 100644
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -1,29 +1,48 @@
-#include "simple-music-iterator.hh"
-#include "translator-group.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2004--2015 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 "context.hh"
+#include "input.hh"
+#include "international.hh"
 #include "music.hh"
+#include "simple-music-iterator.hh"
 
-/**
-  Iterate a property.  
- */
 class Apply_context_iterator : public Simple_music_iterator
 {
 public:
-  VIRTUAL_COPY_CONS (Music_iterator);
-  DECLARE_SCHEME_CALLBACK(constructor, ());
+  DECLARE_SCHEME_CALLBACK (constructor, ());
 protected:
   virtual void process (Moment);
 };
 
-
 void
 Apply_context_iterator::process (Moment m)
 {
-  SCM proc = get_music ()->get_mus_property ("procedure");
+  SCM proc = get_music ()->get_property ("procedure");
 
-  scm_call_1 (proc, report_to()->self_scm());
-  
-  Simple_music_iterator::process(m);
+  if (ly_is_procedure (proc))
+    scm_call_1 (proc, get_outlet ()->self_scm ());
+  else
+    get_music ()->origin ()->warning (_ ("\\applycontext argument is not a procedure"));
+
+  Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Apply_context_iterator);
-  
+