source file of the GNU LilyPond music typesetter
- (c) 1998--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2000 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "file-path.hh"
#include "debug.hh"
#include "direction.hh"
+#include "offset.hh"
SCM
ly_str02scm (char const*c)
}
SCM
-ly_eval_str (char const*c)
+ly_eval_str (String s)
{
// this all really sucks, guile should take char const* arguments!
- return gh_eval_str ((char*)c);
+ return gh_eval_str ((char*)s.ch_C ());
}
return answer;
}
-/*
- scm_m_quote doesn't use any env, but needs one for a good signature in GUILE.
-*/
SCM
ly_quote_scm (SCM s)
{
String
ly_symbol2string (SCM s)
{
+ assert (gh_symbol_p (s));
return String((Byte*)SCM_CHARS (s), (int) SCM_LENGTH(s));
}
error (e);
}
else
- *mlog << '[' << s;
+ progress_indication ("[" + s);
Simple_file_storage f(s);
ly_eval_str ((char *) f.ch_C());
- *mlog << "]" << flush;
+ progress_indication ("]");
}
error (e);
}
else
- *mlog << '[' << s;
+ progress_indication ("[" + s );
Simple_file_storage f(s);
SCM result = ly_str02scm (f.ch_C());
- *mlog << "]";
+ progress_indication ("]");
return result;
}
String
ly_scm2string (SCM s)
{
+ assert (gh_string_p (s));
int len;
char * p = gh_scm2newstr (s , &len);
return s;
}
-SCM
-array_to_list (SCM *a , int l)
-{
- SCM list = SCM_EOL;
- for (int i= l; i--; )
- {
- list = gh_cons (a[i], list);
- }
- return list;
-}
-
SCM
ly_warning (SCM str)
{
}
-void
+static void
init_functions ()
{
scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning);
}
+SCM
+to_scm (int i)
+{
+ return gh_int2scm (i);
+}
+
+/*
+ UGR. junkme.
+ */
+int
+scm_to (SCM s, int* )
+{
+ return gh_number_p (s) ? gh_scm2int (s) : 0;
+}
+
+SCM
+to_scm (Real r)
+{
+ return gh_double2scm (r);
+}
+
+Real
+scm_to (SCM s, Real* )
+{
+ return gh_number_p (s) ? gh_scm2double (s) : 0;
+}
+
+bool
+to_boolean (SCM s)
+{
+ return gh_boolean_p (s) && gh_scm2bool (s);
+}
+
+/*
+ Appendable list L: the cdr contains the list, the car the last cons
+ in the list.
+ */
+SCM
+appendable_list ()
+{
+ SCM s = gh_cons (SCM_EOL, SCM_EOL);
+ gh_set_car_x (s, s);
+
+ return s;
+}
+
+void
+appendable_list_append (SCM l, SCM elt)
+{
+ SCM newcons = gh_cons (elt, SCM_EOL);
+
+ gh_set_cdr_x (gh_car (l), newcons);
+ gh_set_car_x (l, newcons);
+}
+
+
+SCM
+ly_offset2scm (Offset o)
+{
+ return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm(o[Y_AXIS]));
+}
+
+Offset
+ly_scm2offset (SCM s)
+{
+ return Offset (gh_scm2double (gh_car (s)),
+ gh_scm2double (gh_cdr (s)));
+}