X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fapply-context-iterator.cc;h=5ed628491c530d5aa41cbb3e17ebc0e6100d0250;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=38036708c0dd867c0f966b0c4929032cd1f3093e;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git

diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index 38036708c0..5ed628491c 100644
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -1,10 +1,28 @@
-#include "simple-music-iterator.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:
@@ -13,16 +31,18 @@ protected:
   virtual void process (Moment);
 };
 
-
 void
 Apply_context_iterator::process (Moment m)
 {
   SCM proc = get_music ()->get_property ("procedure");
+  if (ly_is_procedure (proc))
+    with_location (get_music ()->get_property ("origin"),
+                   proc, get_outlet ()->self_scm ());
+  else
+    get_music ()->origin ()->warning (_ ("\\applycontext argument is not a procedure"));
 
-  scm_call_1 (proc, get_outlet ()->self_scm ());
-  
   Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Apply_context_iterator);
-  
+