* mf/GNUmakefile: always trace pfa fonts.

[lilypond.git] / lily / include / lily-guile.hh

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index db21226950ece51252d0db034266dcd14d7ef702..5af2ab0176f554ff6b0123e8150419f6bb96d3ca 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef LILY_GUILE_HH
@@ -58,7 +58,7 @@ inline SCM scm_c_make_vector  (int k, SCM val) {
 }
 #define scm_c_define_gsubr scm_make_gsubr
 #define scm_c_eval_string(str) gh_eval_str ((char*)str)
-
+#define scm_remember_upto_here_1(s) scm_remember (&s)
 #define scm_gc_protect_object scm_protect_object
 #define scm_gc_unprotect_object scm_unprotect_object
 #define scm_list_n scm_listify
@@ -105,6 +105,12 @@ SCM ly_deep_copy (SCM);
 SCM ly_truncate_list (int k, SCM l );
 
 
+/*
+  Unreliable on gcc2
+ */
+// #define CACHE_SYMBOLS
+
+
 #if (__GNUC__ > 2)
 /*
   todo: should add check for x86 as well
@@ -196,9 +202,9 @@ void ly_display_scm (SCM s);
 void read_lily_scm_file (String);
 void ly_init_guile ();
 
-bool ly_dir_p (SCM s);
-bool ly_number_pair_p (SCM);
-bool ly_axis_p (SCM);
+bool is_direction (SCM s);
+bool is_number_pair (SCM);
+bool is_axis (SCM);
 
 /*
   these conversion functions also do a typecheck on the argument, and
@@ -219,6 +225,9 @@ SCM index_set_cell (SCM cell, Direction d, SCM val);
 SCM ly_snoc (SCM s, SCM list);
 SCM ly_split_list (SCM s, SCM list);
 SCM ly_unique (SCM list);
+
+
+
 /*
   snarfing.
  */
@@ -250,12 +259,13 @@ TYPE ## _ ## FUNC ## _init_functions ()                                   \
 {                                                              \
   TYPE :: FUNC ## _proc = gh_new_procedure ## ARGCOUNT  ## _0 (#TYPE "::" #FUNC, \
  ((Scheme_function_ ## ARGCOUNT)TYPE :: FUNC));                                \
+  scm_c_export (#TYPE "::" #FUNC, NULL);\
 }                                                              \
                                                                \
 ADD_SCM_INIT_FUNC (TYPE ## _ ## FUNC ## _callback, TYPE ## _ ## FUNC ## _init_functions);      \
 
 
-void ly_add_function_documentation (char const * fname,
+void ly_add_function_documentation (SCM proc, char const * fname,
                                    char const * varlist,
                                    char const * doc);
 
@@ -269,22 +279,29 @@ public:\
 } _ ## name ## _scm_initter;                   \
 /* end define */
 
-#define LY_DEFINE(FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
-SCM FNAME ARGLIST ; \
+#define LY_DEFINE_WITHOUT_DECL(INITPREFIX, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
 SCM FNAME ## _proc;\
 void \
-FNAME ## init ()\
+INITPREFIX ## init ()\
 {\
  FNAME ## _proc \
     = scm_c_define_gsubr (PRIMNAME,REQ, OPT, VAR, (Scheme_function_unknown) FNAME);\
-  ly_add_function_documentation (PRIMNAME, #ARGLIST,  DOCSTRING);\
+  ly_add_function_documentation ( FNAME ## _proc ,PRIMNAME, #ARGLIST,  DOCSTRING);\
+  scm_c_export (PRIMNAME,NULL);\
 }\
-ADD_SCM_INIT_FUNC (FNAME ## init_unique_prefix, FNAME ## init);\
+ADD_SCM_INIT_FUNC (INITPREFIX ## init_unique_prefix, INITPREFIX ## init);\
 SCM \
 FNAME ARGLIST\
 
 
+#define LY_DEFINE(FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
+SCM FNAME ARGLIST ; \
+LY_DEFINE_WITHOUT_DECL(FNAME, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) 
+
 
+#define LY_DEFINE_MEMBER_FUNCTION(CLASS, FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) \
+SCM FNAME ARGLIST ; \
+LY_DEFINE_WITHOUT_DECL(CLASS ## FNAME,  CLASS::FNAME, PRIMNAME, REQ, OPT, VAR, ARGLIST, DOCSTRING) 
 
 
-#endif // LILY_GUILE_HH
+#endif /* LILY_GUILE_HH */