use classnames for interface naming; remove inclusion of

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 8a990cfb43b6f5ec1632e18ba2eb1e4804edcab0..afae13dbecaa922aba2f9c338c5e50f00a1fff9a 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -8,19 +8,31 @@
 
 #include "grob-interface.hh"
 
-#include "protected-scm.hh"
 #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);
+  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_makfrom0str (descr);
   SCM l = parse_symbol_list (vars);
 
   ly_add_interface (s, d, l);
+
+  return s;
 }
 
 void
@@ -43,7 +55,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)
        {
-         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;
@@ -54,7 +66,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 
   if (!found)
     {
-      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);