Mutopia tagline.

[lilypond.git] / lily / grob-interface.cc

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 8d0d394c02ce7bf997a050d4c4ee870bd9f9e3b1..45374a3099dbde6d539a41d98f478620657d7d26 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -15,16 +15,16 @@ void add_interface (const char * symbol,
   SCM l = parse_symbol_list (vars);
 
 
-  ly_add_interface(s,d,l);
+  ly_add_interface (s,d,l);
 }
 
 
-LY_DEFINE(ly_add_interface, "ly-add-interface", 3,0,0, (SCM a, SCM b, SCM c),
+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");    
+  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);
@@ -39,7 +39,7 @@ LY_DEFINE(ly_add_interface, "ly-add-interface", 3,0,0, (SCM a, SCM b, SCM c),
 }
 
 
-LY_DEFINE(ly_all_grob_interfaces, "ly-all-grob-interfaces",
+LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces",
          0,0,0, (),
          "Get a hash table with all interface descriptions.")
 {
@@ -57,8 +57,7 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       return ;
 
     }
-  SCM ifs =  me->get_grob_property ("interfaces");
-
+  SCM ifs =  me->get_property ("interfaces");
 
   bool found = false;
   for (; !found && gh_pair_p (ifs); ifs =gh_cdr (ifs))
@@ -67,19 +66,19 @@ check_interfaces_for_property (Grob const *me, SCM sym)
       if (iface == SCM_BOOL_F)
        {
          String msg = to_string ("Unknown interface `%s'",
-                              ly_scm2string (scm_symbol_to_string (gh_car(ifs))).to_str0 ());
+                              ly_symbol2string (gh_car (ifs)).to_str0 ());
          programming_error (msg);
          continue;
        }
 
-      found= found || (scm_memq (sym, gh_caddr (iface)) != SCM_BOOL_F);
+      found= found || (scm_c_memq (sym, gh_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 ());
+                        ly_symbol2string (sym).to_str0 ());
      programming_error (str);
     }
 }