Merge branch 'master' of git+ssh://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 9d52d4a56a435f40b0eaacdfa643d00e27b6a872..c47937db0f2737ef292f8a5ffba97583a4b5c73e 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -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);
+  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