*** empty log message ***

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 6043ac40e92fb38462bc2150b8d84f50f7c48089..19b88d8a6403d3798317b1f323ed72323478d617 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -29,10 +29,10 @@ void add_interface (const char * symbol,
 LY_DEFINE (ly_add_interface, "ly:add-interface", 3,0,0, (SCM a, SCM b, SCM c),
          "Add an interface description.")
 {
-  SCM_ASSERT_TYPE (is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
-  SCM_ASSERT_TYPE (ly_c_string_p (b), b, SCM_ARG2, __FUNCTION__, "string");  
-  SCM_ASSERT_TYPE (is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
-  if (!is_vector (all_ifaces))
+  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);
@@ -65,18 +65,18 @@ check_interfaces_for_property (Grob const *me, SCM sym)
   SCM ifs = me->get_property ("interfaces");
 
   bool found = false;
-  for (; !found && ly_c_pair_p (ifs); ifs =ly_cdr (ifs))
+  for (; !found && scm_is_pair (ifs); ifs =scm_cdr (ifs))
     {
-      SCM iface = scm_hashq_ref (all_ifaces , ly_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'",
-                                     ly_symbol2string (ly_car (ifs)).to_str0 ()));
+                                     ly_symbol2string (scm_car (ifs)).to_str0 ()));
          programming_error (msg);
          continue;
        }
 
-      found= found || (scm_c_memq (sym, ly_caddr (iface)) != SCM_BOOL_F);
+      found= found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
     }
 
   if (!found)