Run `make grand-replace'.

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

diff --git a/lily/apply-context-iterator.cc b/lily/apply-context-iterator.cc
index ddb00b9df1edefab2d811847efdb18d97b66bdc6..3ed593be587a187b779a55199955a8a459d51cd0 100644 (file)
--- a/lily/apply-context-iterator.cc
+++ b/lily/apply-context-iterator.cc
@@ -1,20 +1,17 @@
-/* 
+/*
   apply-context-iterator.cc -- implement Apply_context_iterator
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2008 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:
@@ -23,19 +20,18 @@ protected:
   virtual void process (Moment);
 };
 
-
 void
 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"));
-  
+    get_music ()->origin ()->warning (_ ("\\applycontext argument is not a procedure"));
+
   Simple_music_iterator::process (m);
 }
 
 IMPLEMENT_CTOR_CALLBACK (Apply_context_iterator);
-  
+