Run `make grand-replace'.

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 779f54377b2502186cf002df706be86560413042..1e968ff421daa2082b4cb0ad181cd85fef9f411d 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--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-interface.hh"
@@ -11,18 +11,27 @@
 #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 *symbol,
+SCM add_interface (char const *cxx_name,
                    char const *descr,
                    char const *vars)
 {
-  SCM s = ly_symbol2scm (symbol);
-  SCM d = scm_makfrom0str (descr);
+  string suffix ("-interface");
+  string lispy_name = camel_case_to_lisp_identifier (cxx_name);
+  vsize end = max (int (0), int (lispy_name.length () - suffix.length ()));
+  if (lispy_name.substr (end) != suffix)
+    lispy_name += suffix;
+
+  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
@@ -45,7 +54,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       SCM iface = scm_hashq_ref (all_ifaces, scm_car (ifs), SCM_BOOL_F);
       if (iface == SCM_BOOL_F)
        {
-         std::string msg = to_string (_f ("Unknown interface `%s'",
+         string msg = to_string (_f ("Unknown interface `%s'",
                                      ly_symbol2string (scm_car (ifs)).c_str ()));
          programming_error (msg);
          continue;
@@ -56,7 +65,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 
   if (!found)
     {
-      std::string str = to_string (_f ("Grob `%s' has no interface for property `%s'",
+      string str = to_string (_f ("Grob `%s' has no interface for property `%s'",
                                  me->name ().c_str (),
                                  ly_symbol2string (sym).c_str ()));
       programming_error (str);