X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=6795ca67d4566c7aa1fb41b01bfaf0a62ccda08d;hb=ce134047181514ea0209630752d736859393b1ca;hp=e496ec6838f38b727fb1d13ea9a8ba76e33c3b23;hpb=ac93c7dd01e0b6661c360acf89721ce9d32e4e4c;p=lilypond.git

diff --git a/lily/music-function.cc b/lily/music-function.cc
index e496ec6838..6795ca67d4 100644
--- 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--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
+
 #include "music-function.hh"
-#include "string.hh"
+
 #include "music.hh"
 
 static scm_t_bits music_function_tag;
@@ -26,32 +26,16 @@ 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 "
+	   "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 = scm_cdr (s))
-    {
-      if (str != "")
-	str += "-";
-      
-      if (scm_car (s) == Music_type_p_proc)
-	str += "music";
-      else if (ly_c_procedure_p (scm_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);
 }
 
@@ -61,13 +45,12 @@ 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 +62,4 @@ init_music_function (void)
   scm_set_smob_print (music_function_tag, print_music_function);
 }
 
-ADD_SCM_INIT_FUNC (music_function_tag, init_music_function); 
+ADD_SCM_INIT_FUNC (music_function_tag, init_music_function);