(Automatic staff changes):

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index 058a58bbf3e831912d0610218cc8f12f02aadda1..5a7e7d0f8d9abbd60c665b6f2fc8d5e8b2d90c78 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -29,11 +29,11 @@ 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 (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_ASSERT_TYPE (ly_c_symbol_p (a), a, SCM_ARG1, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (ly_c_string_p (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,25 +65,25 @@ check_interfaces_for_property (Grob const *me, SCM sym)
   SCM ifs = me->get_property ("interfaces");
 
   bool found = false;
-  for (; !found && gh_pair_p (ifs); ifs =gh_cdr (ifs))
+  for (; !found && ly_c_pair_p (ifs); ifs =ly_cdr (ifs))
     {
-      SCM iface = scm_hashq_ref (all_ifaces , gh_car (ifs), SCM_BOOL_F);
+      SCM iface = scm_hashq_ref (all_ifaces , ly_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 (ly_car (ifs)).to_str0 ()));
          programming_error (msg);
          continue;
        }
 
-      found= found || (scm_c_memq (sym, gh_caddr (iface)) != SCM_BOOL_F);
+      found= found || (scm_c_memq (sym, ly_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 ());
+      String str = to_string (_f ("Grob `%s' has no interface for property `%s'",
+                                 me->name ().to_str0 (),
+                                 ly_symbol2string (sym).to_str0 ()));
       programming_error (str);
     }
 }