Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond into lilypond...

[lilypond.git] / lily / apply-context-iterator.cc

diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index 6f69bbc7b8e8843177122d3c51183d5db6897b70..7874509da21a69aeca96a8043a894ca87c6cf1d5 100644 (file)
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -3,17 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "simple-music-iterator.hh"
 #include "context.hh"
-#include "music.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:
@@ -27,7 +25,7 @@ Apply_context_iterator::process (Moment m)
 {
   SCM proc = get_music ()->get_property ("procedure");
 
-  if (ly_c_procedure_p (proc))
+  if (ly_is_procedure (proc))
     scm_call_1 (proc, get_outlet ()->self_scm ());
   else
     get_music ()->origin ()->warning (_ ("\\applycontext argument is not a procedure"));