X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-interface.cc;h=b0a255d58f9f09f97d436afb4b26a3a8b4ad1fff;hb=131f941d10d6c6d587ec1f41f735fd7ba07e7ea3;hp=8bcf12bdddc83073cc60c84ea78b78b077e7a239;hpb=332da9f4d25f9f63a3222efc87fae06b0c7abbdd;p=lilypond.git

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 8bcf12bddd..b0a255d58f 100644
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2002--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include "grob-interface.hh"
@@ -12,45 +12,17 @@
 #include "grob.hh"
 #include "warn.hh"
 
-Protected_scm all_ifaces;
-
-void add_interface (const char * symbol,
-		    const char * descr,
-		    const char * vars)
+void add_interface (const char *symbol,
+		    const char *descr,
+		    const char *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 (scm_is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (scm_is_string (b), b, SCM_ARG2, __FUNCTION__, "string");  
-  SCM_ASSERT_TYPE (ly_c_list_p (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!ly_c_vector_p (all_ifaces))
-    all_ifaces = scm_make_vector (scm_int2num (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_add_interface (s, d, l);
 }
 
-
-LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces",
-	  0,0,0, (),
-	  "Get a hash table with all interface descriptions.")
-{
-  return all_ifaces;
-}
-
-
 void
 check_interfaces_for_property (Grob const *me, SCM sym)
 {
@@ -58,16 +30,16 @@ check_interfaces_for_property (Grob const *me, SCM sym)
     {
       /*
 	otherwise we get in a nasty recursion loop.
-       */
-      return ;
-
+      */
+      return;
     }
   SCM ifs = me->get_property ("interfaces");
 
+  SCM all_ifaces = ly_all_grob_interfaces ();
   bool found = false;
   for (; !found && scm_is_pair (ifs); ifs = scm_cdr (ifs))
     {
-      SCM iface = scm_hashq_ref (all_ifaces , scm_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 (_f ("Unknown interface `%s'",