Run `make grand-replace'.

[lilypond.git] / lily / music-function.cc

diff --git a/lily/music-function.cc b/lily/music-function.cc
index 267e15f155c4eaf0c56bc77b426fcfc741523f48..109f6d019bf1c006df66bfbf05c069a8899ad60a 100644 (file)
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,13 +1,13 @@
-/* 
-  music-function.cc --  implement music_function
-  
+/*
+  music-function.cc -- implement music_function
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-  
+
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
 #include "music-function.hh"
-#include "string.hh"
+
 #include "music.hh"
 
 static scm_t_bits music_function_tag;
@@ -26,48 +26,18 @@ print_music_function (SCM b, SCM port, scm_print_state *)
   return 1;
 }
 
-
-LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
-          (SCM signature, SCM func),
-         "Make a function to process music, to be used for the "
-          "parser. @code{func} is the function, and @code{signature} describes "
-          "Its arguments. @code{signature} is a list containing either "
-          "@code{ly:music?} predicates or other type predicates.")
-{
-  String str = "";
-  for (SCM s = signature; scm_is_pair (s); s = ly_cdr (s))
-    {
-      if (str != "")
-       str += "-";
-      
-      if (ly_car (s) == Music_type_p_proc)
-       str += "music";
-      else if (ly_c_procedure_p (ly_car (s)))
-       str += "scm";
-    }
-  if (str == "") str = "noarg";
-  scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature"),
-                            signature);
-  
-  scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature-keyword"),
-                            ly_symbol2scm (str.to_str0 ()));
-    
-  SCM_RETURN_NEWSMOB (music_function_tag, func);
-}
-
 bool
 is_music_function (SCM music_function)
 {
   return (SCM_NIMP (music_function) && SCM_CELL_TYPE (music_function) == music_function_tag);
 }
 
-
 SCM
 get_music_function_transform (SCM music_function)
 {
   if (!is_music_function (music_function))
     return SCM_UNDEFINED;
-  
+
   return SCM_CELL_OBJECT_1 (music_function);
 }
 
@@ -79,4 +49,14 @@ init_music_function (void)
   scm_set_smob_print (music_function_tag, print_music_function);
 }
 
-ADD_SCM_INIT_FUNC (music_function_tag, init_music_function); 
+SCM
+make_music_function (SCM signature, SCM func)
+{
+  scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature"),
+                            signature);
+
+  SCM_RETURN_NEWSMOB (music_function_tag, func);
+}
+
+ADD_SCM_INIT_FUNC (music_function_tag, init_music_function);
+