Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/music-function.cc b/lily/music-function.cc
index b1b3bba0bb2246e33e3a22745f98f89dfcb9a087..8f0f7813d9d96b82333f773de3cc82da7cbe67b8 100644 (file)
--- a/lily/music-function.cc
+++ b/lily/music-function.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "music-function.hh"
@@ -33,17 +33,19 @@ LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
           "Its arguments. @code{signature} is a list containing either "
           "@code{ly:music?} predicates or other type predicates.")
 {
-  String str = "";
+  extern SCM ly_music_p_proc;
+  
+  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)
+      if (scm_car (s) == ly_music_p_proc)
        str += "music";
       else if (scm_car (s) == ly_lily_module_constant ("markup?"))
        str += "markup";
-      else if (ly_c_procedure_p (scm_car (s)))
+      else if (ly_is_procedure (scm_car (s)))
        str += "scm";
     }
   if (str == "") str = "noarg";
@@ -51,7 +53,7 @@ LY_DEFINE (ly_make_music_function, "ly:make-music-function", 2, 0, 0,
                             signature);
 
   scm_set_object_property_x (func, ly_symbol2scm ("music-function-signature-keyword"),
-                            ly_symbol2scm (str.to_str0 ()));
+                            ly_symbol2scm (str.c_str ()));
 
   SCM_RETURN_NEWSMOB (music_function_tag, func);
 }