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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 283a49fe83..1e968ff421 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,86 +1,73 @@
-#include  "protected-scm.hh"
+/*
+  grob-interface.cc -- implement graphic objects interface
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2002--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
 #include "grob-interface.hh"
-#include "lily-guile.hh"
+
 #include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "string-convert.hh"
 #include "warn.hh"
+#include "misc.hh"
 
-Protected_scm all_ifaces;
-
-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 = gh_str02scm (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);
 
+  internal_add_interface (s, d, l);
 
-  ly_add_interface(s,d,l);
+  return s;
 }
 
-SCM
-ly_add_interface (SCM a, SCM b, SCM c)
+void
+check_interfaces_for_property (Grob const *me, SCM sym)
 {
-  SCM_ASSERT_TYPE (gh_symbol_p(a), a, SCM_ARG1, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (gh_string_p(b), b, SCM_ARG2, __FUNCTION__, "string");  
-  SCM_ASSERT_TYPE (gh_list_p(c), c,  SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!gh_vector_p (all_ifaces))
+  if (sym == ly_symbol2scm ("meta"))
     {
-      all_ifaces = scm_make_vector (gh_int2scm (40), SCM_EOL);
+      /*
+	otherwise we get in a nasty recursion loop.
+      */
+      return;
     }
 
-  SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
-
-  scm_hashq_set_x (all_ifaces, a, entry);
-
-
-  return SCM_UNSPECIFIED;
-}
-
-
-SCM
-ly_all_grob_interfaces ()
-{
-  return all_ifaces;
-}
-
-void
-init_iface_funcs ()
-{
-  scm_c_define_gsubr ("ly-add-interface", 3, 0, 0,
-		      (Scheme_function_unknown)ly_add_interface);
-  scm_c_define_gsubr ("ly-all-grob-interfaces", 0, 0, 0,
-		      (Scheme_function_unknown)ly_all_grob_interfaces);
-}
-
-ADD_SCM_INIT_FUNC(giface, init_iface_funcs);
-
-void
-check_interfaces_for_property (Grob *me, SCM sym)
-{
-  SCM ifs =  me->get_grob_property ("interfaces");
-
+  SCM ifs = me->interfaces ();
 
+  SCM all_ifaces = ly_all_grob_interfaces ();
   bool found = false;
-  for (; !found && gh_pair_p (ifs); ifs =gh_cdr (ifs))
+  for (; !found && scm_is_pair (ifs); ifs = scm_cdr (ifs))
     {
-      SCM iface = scm_hashq_ref (all_ifaces , gh_car (ifs), SCM_BOOL_F);
+      SCM iface = scm_hashq_ref (all_ifaces, scm_car (ifs), SCM_BOOL_F);
       if (iface == SCM_BOOL_F)
 	{
-	  String msg = to_str ("Unknown interface `%s'",
-			       ly_scm2string (scm_symbol_to_string (gh_car(ifs))).ch_C());
+	  string msg = to_string (_f ("Unknown interface `%s'",
+				      ly_symbol2string (scm_car (ifs)).c_str ()));
 	  programming_error (msg);
 	  continue;
 	}
 
-      found= found || (scm_memq (sym, gh_caddr (iface)) != SCM_BOOL_F);
+      found = found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
     }
 
   if (!found)
     {
-     String str = to_str("Grob %s has no interface for property %s",
-			 me->name ().ch_C(),
-			 ly_symbol2string(sym).ch_C());
-     programming_error (str);
+      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);
     }
 }