* lily/text-item.cc (interpret_string): new file, select font with

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

diff --git a/lily/grob-interface.cc b/lily/grob-interface.cc
index f8ae9359832a83ad284164e32e3584b6ef74ce26..58706d5b74d47b78dc1ea22918930440291d2fca 100644 (file)
--- a/lily/grob-interface.cc
+++ b/lily/grob-interface.cc
@@ -1,4 +1,12 @@
-#include  "protected-scm.hh"
+/*
+  grob-interface.cc -- implement graphic objects interface
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
+
+#include "protected-scm.hh"
 #include "grob-interface.hh"
 #include "lily-guile.hh"
 #include "grob.hh"
@@ -11,49 +19,37 @@ void add_interface (const char * symbol,
                    const char * vars)
 {
   SCM s = ly_symbol2scm (symbol);
-  SCM d = gh_str02scm (descr);
+  SCM d = scm_makfrom0str (descr);
   SCM l = parse_symbol_list (vars);
 
-
-  ly_add_interface(s,d,l);
+  ly_add_interface (s,d,l);
 }
 
-SCM
-ly_add_interface (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");    
-  if (!gh_vector_p (all_ifaces))
-    {
-      all_ifaces = scm_make_vector (gh_int2scm (40), SCM_EOL);
-    }
+  SCM_ASSERT_TYPE (is_symbol (a), a, SCM_ARG1, __FUNCTION__, "symbol");
+  SCM_ASSERT_TYPE (is_string (b), b, SCM_ARG2, __FUNCTION__, "string");  
+  SCM_ASSERT_TYPE (is_list (c), c, SCM_ARG3, __FUNCTION__, "list of syms");    
+  if (!is_vector (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;
 }
 
 
-SCM
-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.")
 {
   return all_ifaces;
 }
 
-void
-init_iface_funcs ()
-{
-  scm_c_define_gsubr ("ly-add-interface", 3, 0, 0,
-                     (Scheme_function_unknown)ly_add_interface);
-  scm_c_define_gsubr ("ly-all-grob-interfaces", 0, 0, 0,
-                     (Scheme_function_unknown)ly_all_grob_interfaces);
-}
-
-ADD_SCM_INIT_FUNC(giface, init_iface_funcs);
 
 void
 check_interfaces_for_property (Grob const *me, SCM sym)
@@ -66,29 +62,28 @@ 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))
+  for (; !found && is_pair (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_str ("Unknown interface `%s'",
-                              ly_scm2string (scm_symbol_to_string (gh_car(ifs))).ch_C());
+         String msg = to_string (_f ("Unknown interface `%s'",
+                                     ly_symbol2string (ly_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, ly_caddr (iface)) != SCM_BOOL_F);
     }
 
   if (!found)
     {
-     String str = to_str("Grob %s has no interface for property %s",
-                        me->name ().ch_C(),
-                        ly_symbol2string(sym).ch_C());
-     programming_error (str);
+      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);
     }
 }