X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-interface.cc;h=1e968ff421daa2082b4cb0ad181cd85fef9f411d;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6e155aa68bde961d800f28fb915dffc066c7be49;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 6e155aa68b..1e968ff421 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -3,24 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "grob-interface.hh"
 
-#include "protected-scm.hh"
 #include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "string-convert.hh"
 #include "warn.hh"
+#include "misc.hh"
 
-void add_interface (const char *symbol,
-		    const char *descr,
-		    const char *vars)
+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
@@ -32,9 +43,9 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 	otherwise we get in a nasty recursion loop.
       */
       return;
-
     }
-  SCM ifs = me->get_property ("interfaces");
+
+  SCM ifs = me->interfaces ();
 
   SCM all_ifaces = ly_all_grob_interfaces ();
   bool found = false;
@@ -43,8 +54,8 @@ 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'",
-				      ly_symbol2string (scm_car (ifs)).to_str0 ()));
+	  string msg = to_string (_f ("Unknown interface `%s'",
+				      ly_symbol2string (scm_car (ifs)).c_str ()));
 	  programming_error (msg);
 	  continue;
 	}
@@ -54,9 +65,9 @@ check_interfaces_for_property (Grob const *me, SCM sym)
 
   if (!found)
     {
-      String str = to_string (_f ("Grob `%s' has no interface for property `%s'",
-				  me->name ().to_str0 (),
-				  ly_symbol2string (sym).to_str0 ()));
+      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);
     }
 }