X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-interface.cc;h=9d52d4a56a435f40b0eaacdfa643d00e27b6a872;hb=9e752ec70a160d6c3d7632036de75630438c4142;hp=18f699c4a4a4a5856686d7f503ebca41569404bb;hpb=d670b9cd2b2987bb3dcadd7590d25b15b9c33302;p=lilypond.git

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 18f699c4a4..9d52d4a56a 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,49 +1,28 @@
-#include  "protected-scm.hh"
+/*
+  grob-interface.cc -- implement graphic objects interface
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2002--2006 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 "std-string.hh"
 #include "warn.hh"
 
-Protected_scm all_ifaces;
-
-void add_interface (const char * symbol,
-		    const char * descr,
-		    const char * vars)
+void add_interface (char const *symbol,
+		    char const *descr,
+		    char const *vars)
 {
   SCM s = ly_symbol2scm (symbol);
   SCM d = scm_makfrom0str (descr);
   SCM l = parse_symbol_list (vars);
 
-
-  ly_add_interface(s,d,l);
-}
-
-
-LY_DEFINE(ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
-	  "Add an interface description.")
-{
-  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))
-    {
-      all_ifaces = scm_make_vector (gh_int2scm (40), SCM_EOL);
-    }
-
-  SCM entry = scm_list_n (a, b, c, SCM_UNDEFINED);
-
-  scm_hashq_set_x (all_ifaces, a, entry);
-
-
-  return SCM_UNSPECIFIED;
-}
-
-
-LY_DEFINE(ly_all_grob_interfaces, "ly:all-grob-interfaces",
-	  0,0,0, (),
-	  "Get a hash table with all interface descriptions.")
-{
-  return all_ifaces;
+  ly_add_interface (s, d, l);
 }
 
 void
@@ -53,32 +32,33 @@ check_interfaces_for_property (Grob const *me, SCM sym)
     {
       /*
 	otherwise we get in a nasty recursion loop.
-       */
-      return ;
-
+      */
+      return;
     }
-  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_string ("Unknown interface `%s'",
-			       ly_symbol2string (gh_car(ifs)).to_str0 ());
+	  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_string ("Grob %s has no interface for property %s",
-			 me->name ().to_str0 (),
-			 ly_symbol2string(sym).to_str0 ());
-     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);
     }
 }