X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-function.cc;h=85eecb7c33eb371216781cc7e3dedca0f48de4a8;hb=27d3e1188a9885e72a5afbd72482617b34907f30;hp=b784131650e3d5e96391ee232892dfa0a0b91989;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git

diff --git a/lily/music-function.cc b/lily/music-function.cc
index b784131650..85eecb7c33 100644
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,9 +1,20 @@
 /*
-  music-function.cc -- implement music_function
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004--2005 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 "music-function.hh"
@@ -26,36 +37,6 @@ 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 = scm_cdr (s))
-    {
-      if (str != "")
-	str += "-";
-
-      if (scm_car (s) == Music_type_p_proc)
-	str += "music";
-      else if (scm_car (s) == ly_lily_module_constant ("markup?"))
-	str += "markup";
-      else if (ly_is_procedure (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);
-}
-
 bool
 is_music_function (SCM music_function)
 {
@@ -79,4 +60,14 @@ init_music_function (void)
   scm_set_smob_print (music_function_tag, print_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);
+