source file of the GNU LilyPond music typesetter
- (c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2002--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-#include "protected-scm.hh"
#include "grob-interface.hh"
-#include "lily-guile.hh"
+
#include "grob.hh"
+#include "international.hh"
+#include "protected-scm.hh"
+#include "string-convert.hh"
#include "warn.hh"
+#include "misc.hh"
-Protected_scm all_ifaces;
-
-void add_interface (const char * symbol,
- const char * descr,
- const char * vars)
+SCM add_interface (char const *cxx_name,
+ char const *descr,
+ char const *vars)
{
- SCM s = ly_symbol2scm (symbol);
- SCM d = scm_makfrom0str (descr);
+ string suffix ("-interface");
+ string lispy_name = camel_case_to_lisp_identifier (cxx_name);
+ vsize end = max (int (0), int (lispy_name.length () - suffix.length ()));
+ if (lispy_name.substr (end) != suffix)
+ lispy_name += suffix;
+
+ SCM s = ly_symbol2scm (lispy_name.c_str ());
+ SCM d = scm_from_locale_string (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);
+ internal_add_interface (s, d, l);
- scm_hashq_set_x (all_ifaces, a, entry);
-
- return SCM_UNSPECIFIED;
-}
-
-
-LY_DEFINE (ly_all_grob_interfaces, "ly:all-grob-interfaces",
- 0,0,0, (),
- "Get a hash table with all interface descriptions.")
-{
- return all_ifaces;
+ return s;
}
-
void
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 ifs = me->interfaces ();
+
+ SCM all_ifaces = ly_all_grob_interfaces ();
bool found = false;
- for (; !found && scm_is_pair (ifs); ifs =scm_cdr (ifs))
+ 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'",
- ly_symbol2string (scm_car (ifs)).to_str0 ()));
+ string msg = to_string (_f ("Unknown interface `%s'",
+ ly_symbol2string (scm_car (ifs)).c_str ()));
programming_error (msg);
continue;
}
- found= found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
+ found = found || (scm_c_memq (sym, scm_caddr (iface)) != SCM_BOOL_F);
}
if (!found)
{
- String str = to_string (_f ("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 ().c_str (),
+ ly_symbol2string (sym).c_str ()));
programming_error (str);
}
}