Merge branch 'master' of ssh+git://hanwen@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / grob-interface.cc

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index bd753f80c6f62fb6202213ed0d36c2b871455347..f73d5dcd769c8fb1a4e2dc4149aaadf865050fac 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2002--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-interface.hh"
@@ -11,13 +11,11 @@
 #include "grob.hh"
 #include "international.hh"
 #include "protected-scm.hh"
-#include "std-string.hh"
 #include "string-convert.hh"
 #include "warn.hh"
 #include "misc.hh"
 
-void add_interface (char const *cxx_name,
-                   char const *symbol,
+SCM add_interface (char const *cxx_name,
                    char const *descr,
                    char const *vars)
 {
@@ -27,15 +25,13 @@ void add_interface (char const *cxx_name,
   if (lispy_name.substr (end) != suffix)
     lispy_name += suffix;
 
-  if (lispy_name != string (symbol))
-    programming_error (String_convert::form_string ("%s != %s", lispy_name.c_str (),
-                                                   symbol));
-    
-  SCM s = ly_symbol2scm (symbol);
-  SCM d = scm_makfrom0str (descr);
+  SCM s = ly_symbol2scm (lispy_name.c_str ());
+  SCM d = scm_from_locale_string (descr);
   SCM l = parse_symbol_list (vars);
 
-  ly_add_interface (s, d, l);
+  internal_add_interface (s, d, l);
+
+  return s;
 }
 
 void