new file.

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

diff --git a/lily/music-function.cc b/lily/music-function.cc
index 11cda8255c495b6f8d159a559987a5212df6e00f..0113c6543cdd1480085a98c22fcf8664e6b6c5af 100644 (file)
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -1,13 +1,14 @@
 /* 
-  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--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
   
 */
+
 #include "music-function.hh"
-#include "string.hh"
+
 #include "music.hh"
 
 static scm_t_bits music_function_tag;
@@ -18,7 +19,7 @@ print_music_function (SCM b, SCM port, scm_print_state *)
 {
   SCM value = SCM_CELL_OBJECT_1 (b);
 
-  scm_puts ("#<packaged object ", port);
+  scm_puts ("#<Music function ", port);
   scm_write (value, port);
   scm_puts (">", port);
 
@@ -35,17 +36,19 @@ LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
           "@code{ly:music?} predicates or other type predicates.")
 {
   String str = "";
-  for (SCM s = signature; ly_c_pair_p (s); s = ly_cdr (s))
+  for (SCM s = signature; scm_is_pair (s); s = scm_cdr (s))
     {
       if (str != "")
        str += "-";
       
-      if (ly_car (s) == Music_type_p_proc)
+      if (scm_car (s) == Music_type_p_proc)
        str += "music";
-      else if (ly_c_procedure_p (ly_car (s)))
+      else if (scm_car (s) == ly_lily_module_constant("markup?"))
+       str += "markup";
+      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);
   
@@ -78,4 +81,5 @@ init_music_function (void)
   scm_set_smob_mark (music_function_tag, scm_markcdr);
   scm_set_smob_print (music_function_tag, print_music_function);
 }
+
 ADD_SCM_INIT_FUNC (music_function_tag, init_music_function);