source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+ Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <ctype.h>
#include "lily-proto.hh"
+#include "version.hh"
-/* macosx fix:
-
+/* MacOS S fix:
+ source-file.hh includes cmath which undefines isinf and isnan
- source-file.hh includes cmath which undefines isinf and isnan
+ FIXME: #ifdef MACOS_X?
*/
-inline int my_isinf(Real r) { return isinf(r); }
-inline int my_isnan(Real r) { return isnan(r); }
-
+inline int my_isinf (Real r) { return isinf (r); }
+inline int my_isnan (Real r) { return isnan (r); }
#include "libc-extension.hh"
SCM write = scm_primitive_eval (ly_symbol2scm ("write"));
// scm_apply (write, port, SCM_EOL);
- gh_call2 (write, s, port);
+ scm_call_2 (write, s, port);
return scm_strport_to_string (port);
}
String
ly_symbol2string (SCM s)
{
- assert (gh_symbol_p (s));
+ assert (ly_c_symbol_p (s));
return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
}
return result;
}
-LY_DEFINE(ly_gulp_file, "ly:gulp-file", 1,0, 0,
- (SCM name),
- "Read the file named @var{name}, and return its contents in a string. The "
-" file is looked up using the lilypond search path.")
+LY_DEFINE (ly_gulp_file, "ly:gulp-file",
+ 1, 0, 0, (SCM name),
+ "Read the file @var{name}, and return its contents in a string. "
+ "The file is looked up using the search path.")
{
+ SCM_ASSERT_TYPE (ly_c_string_p (name), name, SCM_ARG1, __FUNCTION__, "string");
return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ());
}
void
ly_display_scm (SCM s)
{
- gh_display (s);
- gh_newline ();
+ scm_display (s, scm_current_output_port ());
+ scm_newline (scm_current_output_port ());
}
};
String
ly_scm2string (SCM s)
{
- assert (gh_string_p (s));
+ assert (ly_c_string_p (s));
- char *p = SCM_STRING_CHARS(s);
+ char *p = SCM_STRING_CHARS (s);
String r (p);
return r;
}
+char *
+ly_scm2newstr (SCM str, size_t *lenp)
+{
+ SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+
+ size_t len = SCM_STRING_LENGTH (str);
+ if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
+ {
+ memcpy (new_str, SCM_STRING_CHARS (str), len);
+ new_str[len] = '\0';
+
+ if (lenp)
+ *lenp = len;
+
+ return new_str;
+ }
+ return 0;
+}
+
SCM
index_get_cell (SCM s, Direction d)
{
index_set_cell (SCM s, Direction d, SCM v)
{
if (d == LEFT)
- gh_set_car_x (s, v);
+ scm_set_car_x (s, v);
else if (d == RIGHT)
- gh_set_cdr_x (s, v);
+ scm_set_cdr_x (s, v);
return s;
}
-LY_DEFINE(ly_warning,"ly:warn", 1, 0, 0,
- (SCM str),"Scheme callable function to issue the warning @code{msg}.")
+LY_DEFINE (ly_warn, "ly:warn",
+ 1, 0, 0, (SCM str),
+ "Scheme callable function to issue the warning @code{msg}.")
{
- SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+ SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+ progress_indication ("\n");
warning ("lily-guile: " + ly_scm2string (str));
return SCM_BOOL_T;
}
-LY_DEFINE(ly_dir_p, "ly:dir?", 1,0, 0, (SCM s),
- "type predicate. A direction is a -1, 0 or 1, where -1 represents "
- "left or down and 1 represents right or up. ")
+LY_DEFINE (ly_dir_p, "ly:dir?",
+ 1, 0, 0, (SCM s),
+ "type predicate. A direction is @code{-1}, @code{0} or "
+ "@code{1}, where @code{-1} represents "
+ "left or down and @code{1} represents right or up.")
{
- if (gh_number_p (s))
+ if (ly_c_number_p (s))
{
- int i = gh_scm2int (s);
+ int i = ly_scm2int (s);
return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
}
return SCM_BOOL_F;
bool
is_number_pair (SCM p)
{
- return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
+ return ly_c_pair_p (p)
+ && ly_c_number_p (ly_car (p)) && ly_c_number_p (ly_cdr (p));
}
typedef void (*Void_fptr) ();
scm_init_funcs_->push (f);
}
-
void
ly_init_ly_module (void *)
{
scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
}
-
-SCM lily_module ;
+SCM global_lily_module;
void
-ly_init_guile ()
+ly_c_init_guile ()
{
- lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
+ global_lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
scm_c_use_module ("lily");
}
-unsigned int ly_scm_hash (SCM s)
+unsigned int
+ly_scm_hash (SCM s)
{
return scm_ihashv (s, ~1u);
}
-
-
bool
is_direction (SCM s)
{
- if (gh_number_p (s))
+ if (ly_c_number_p (s))
{
- int i = gh_scm2int (s);
+ int i = ly_scm2int (s);
return i>= -1 && i <= 1;
}
return false;
}
-
bool
is_axis (SCM s)
{
- if (gh_number_p (s))
+ if (ly_c_number_p (s))
{
- int i = gh_scm2int (s);
+ int i = ly_scm2int (s);
return i== 0 || i == 1;
}
return false;
}
-
Direction
to_dir (SCM s)
{
- return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER;
+ return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER;
}
Interval
ly_scm2interval (SCM p)
{
- return Interval (gh_scm2double (ly_car (p)),
- gh_scm2double (ly_cdr (p)));
+ return Interval (ly_scm2double (ly_car (p)), ly_scm2double (ly_cdr (p)));
+}
+
+Drul_array<Real>
+ly_scm2realdrul (SCM p)
+{
+ return Drul_array<Real> (ly_scm2double (ly_car (p)),
+ ly_scm2double (ly_cdr (p)));
}
SCM
ly_interval2scm (Drul_array<Real> i)
{
- return gh_cons (gh_double2scm (i[LEFT]),
- gh_double2scm (i[RIGHT]));
+ return scm_cons (scm_make_real (i[LEFT]), scm_make_real (i[RIGHT]));
}
-
-
-
bool
to_boolean (SCM s)
{
- return gh_boolean_p (s) && gh_scm2bool (s);
+ return ly_c_boolean_p (s) && ly_scm2bool (s);
}
-/*
- Appendable list L: the cdr contains the list, the car the last cons
- in the list.
- */
+/* 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);
+ SCM s = scm_cons (SCM_EOL, SCM_EOL);
+ scm_set_car_x (s, s);
return s;
}
void
appendable_list_append (SCM l, SCM elt)
{
- SCM newcons = gh_cons (elt, SCM_EOL);
+ SCM newcons = scm_cons (elt, SCM_EOL);
- gh_set_cdr_x (ly_car (l), newcons);
- gh_set_car_x (l, newcons);
+ scm_set_cdr_x (ly_car (l), newcons);
+ scm_set_car_x (l, newcons);
}
-
SCM
ly_offset2scm (Offset o)
{
- return gh_cons (gh_double2scm (o[X_AXIS]), gh_double2scm (o[Y_AXIS]));
+ return scm_cons (scm_make_real (o[X_AXIS]), scm_make_real (o[Y_AXIS]));
}
Offset
ly_scm2offset (SCM s)
{
- return Offset (gh_scm2double (ly_car (s)),
- gh_scm2double (ly_cdr (s)));
+ return Offset (ly_scm2double (ly_car (s)),
+ ly_scm2double (ly_cdr (s)));
}
-
-LY_DEFINE(ly_number2string, "ly:number->string", 1, 0,0,
- (SCM s),
- " converts @var{num} to a string without generating many decimals. It "
-"leaves a space at the end.")
+LY_DEFINE (ly_number2string, "ly:number->string",
+ 1, 0, 0, (SCM s),
+ "Convert @var{num} to a string without generating many decimals.")
{
- SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
+ SCM_ASSERT_TYPE (ly_c_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
char str[400]; // ugh.
if (scm_exact_p (s) == SCM_BOOL_F)
{
- Real r (gh_scm2double (s));
+ Real r (ly_scm2double (s));
if (my_isinf (r) || my_isnan (r))
{
r = 0.0;
}
- sprintf (str, "%8.4f ", r);
+ sprintf (str, "%08.4f", r);
}
else
- {
- sprintf (str, "%d ", gh_scm2int (s));
- }
+ sprintf (str, "%d", ly_scm2int (s));
return scm_makfrom0str (str);
}
-/*
- Undef this to see if GUILE GC is causing too many swaps.
- */
-
-//#define TEST_GC
-#ifdef TEST_GC
-#include <libguile/gc.h>
-static void *
-greet_sweep (void *dummy1, void *dummy2, void *dummy3)
-{
- fprintf (stderr, "entering sweep\n");
-}
-
-static void *
-wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
-{
- fprintf (stderr, "leaving sweep\n");
-}
-#endif
-
-
-#include "version.hh"
-LY_DEFINE(ly_version, "ly:version", 0, 0, 0, (),
+LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
"Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
{
- char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
+ char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " " PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
- return gh_eval_str ((char*)vs);
+ return scm_c_eval_string ((char*)vs);
}
-LY_DEFINE(ly_unit, "ly:unit", 0, 0, 0, (),
+LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
"Return the unit used for lengths as a string.")
{
return scm_makfrom0str (INTERNAL_UNIT);
-LY_DEFINE(ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
+LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
"Return @var{d} is a number. Used to distinguish length "
"variables from normal numbers.")
{
return scm_number_p (d);
}
-static void
-init_functions ()
-{
-#ifdef TEST_GC
- scm_c_hook_add (&scm_before_mark_c_hook, greet_sweep, 0, 0);
- scm_c_hook_add (&scm_before_sweep_c_hook, wave_sweep_goodbye, 0, 0);
-#endif
-}
-
-ADD_SCM_INIT_FUNC (funcs, init_functions);
-
SCM
ly_deep_copy (SCM src)
{
- if (gh_pair_p (src))
- {
- return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src)));
- }
- else if (gh_vector_p (src))
+ if (ly_c_pair_p (src))
+ return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src)));
+ else if (ly_c_vector_p (src))
{
- int l = SCM_VECTOR_LENGTH (src);
- SCM nv = scm_c_make_vector (l, SCM_UNDEFINED);
- for (int i =0 ; i< l ; i++)
+ int len = SCM_VECTOR_LENGTH (src);
+ SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
+ for (int i =0 ; i < len ; i++)
{
- SCM si = gh_int2scm (i);
+ SCM si = scm_int2num (i);
scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
}
}
- else
- return src;
-
return src;
}
SCM
ly_assoc_chain (SCM key, SCM achain)
{
- if (gh_pair_p (achain))
+ if (ly_c_pair_p (achain))
{
SCM handle = scm_assoc (key, ly_car (achain));
- if (gh_pair_p (handle))
+ if (ly_c_pair_p (handle))
return handle;
else
return ly_assoc_chain (key, ly_cdr (achain));
SCM
ly_assoc_cdr (SCM key, SCM alist)
{
- if (gh_pair_p (alist)) {
- SCM trykey = ly_caar(alist);
- if(gh_pair_p(trykey) && to_boolean(scm_equal_p(key,ly_cdr(trykey))))
- return ly_car(alist);
- else
- return ly_assoc_cdr (key, ly_cdr (alist));
- }
- else
- return SCM_BOOL_F;
+ if (ly_c_pair_p (alist))
+ {
+ SCM trykey = ly_caar (alist);
+ if (ly_c_pair_p (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey))))
+ return ly_car (alist);
+ else
+ return ly_assoc_cdr (key, ly_cdr (alist));
+ }
+ return SCM_BOOL_F;
}
-/*
- LIST has the form "sym1 sym2 sym3\nsym4\nsym5"
-
- i.e. \n and ' ' can be used interchangeably as separators.
- */
+/* LST has the form "sym1 sym2 sym3\nsym4\nsym5"
+ i.e. \n and ' ' can be used interchangeably as separators. */
SCM
-parse_symbol_list (const char * list)
+parse_symbol_list (char const *lst)
{
- char * s = strdup (list);
+ char *s = strdup (lst);
char *orig = s;
SCM create_list = SCM_EOL;
char * e = s + strlen (s) - 1;
while (e >= s && isspace (*e))
- *e -- = 0;
+ *e-- = 0;
for (char * p = s; *p; p++)
- {
- if (*p == '\n')
- *p = ' ' ;
- }
+ if (*p == '\n')
+ *p = ' ';
- if (!s[0] )
+ if (!s[0])
s = 0;
-
-
while (s)
{
if (next)
*next++ = 0;
- create_list = gh_cons (ly_symbol2scm (s), create_list);
+ create_list = scm_cons (ly_symbol2scm (s), create_list);
s = next;
}
return create_list;
}
-
SCM
-ly_truncate_list (int k, SCM l )
+ly_truncate_list (int k, SCM lst)
{
if (k == 0)
- {
- l = SCM_EOL;
- }
+ lst = SCM_EOL;
else
{
- SCM s = l;
+ SCM s = lst;
k--;
- for (; gh_pair_p (s) && k--; s = ly_cdr (s))
+ for (; ly_c_pair_p (s) && k--; s = ly_cdr (s))
;
- if (gh_pair_p (s))
- {
- gh_set_cdr_x (s, SCM_EOL);
- }
+ if (ly_c_pair_p (s))
+ scm_set_cdr_x (s, SCM_EOL);
}
- return l;
+ return lst;
}
-
String
print_scm_val (SCM val)
{
String realval = ly_scm2string (ly_write2scm (val));
if (realval.length () > 200)
- realval = realval.left_string (100) + "\n :\n :\n" + realval.right_string (100);
-
+ realval = realval.left_string (100)
+ + "\n :\n :\n"
+ + realval.right_string (100);
return realval;
}
if (val == SCM_EOL || val == SCM_BOOL_F)
return ok;
- if (!gh_symbol_p (sym))
+ if (!ly_c_symbol_p (sym))
#if 0
return false;
#else
SCM type = scm_object_property (sym, type_symbol);
- if (type != SCM_EOL && !gh_procedure_p (type))
+ if (type != SCM_EOL && !ly_c_procedure_p (type))
{
warning (_f ("Can't find property type-check for `%s' (%s).",
ly_symbol2string (sym).to_str0 (),
else
{
if (val != SCM_EOL
- && gh_procedure_p (type)
- && gh_call1 (type, val) == SCM_BOOL_F)
+ && ly_c_procedure_p (type)
+ && scm_call_1 (type, val) == SCM_BOOL_F)
{
SCM errport = scm_current_error_port ();
ok = false;
- SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name"));
- SCM type_name = gh_call1 (typefunc, type);
+ SCM typefunc = ly_scheme_function ("type-name");
+ SCM type_name = scm_call_1 (typefunc, type);
scm_puts (_f ("Type check for `%s' failed; value `%s' must be of type `%s'",
ly_unique (SCM list)
{
SCM unique = SCM_EOL;
- for (SCM i = list; gh_pair_p (i); i = ly_cdr (i))
+ for (SCM i = list; ly_c_pair_p (i); i = ly_cdr (i))
{
- if (!gh_pair_p (ly_cdr (i))
- || !gh_equal_p (ly_car (i), ly_cadr (i)))
- unique = gh_cons (ly_car (i), unique);
+ if (!ly_c_pair_p (ly_cdr (i))
+ || !ly_c_equal_p (ly_car (i), ly_cadr (i)))
+ unique = scm_cons (ly_car (i), unique);
}
return scm_reverse_x (unique, SCM_EOL);
}
+
+static int
+scm_default_compare (void const *a, void const *b)
+{
+ SCM pa = *(SCM*) a;
+ SCM pb = *(SCM*) b;
+ if (pa == pb)
+ return 0;
+ return pa < pb ? -1 : 1;
+}
+
+/* Modify LST in place: qsort it. */
+SCM
+ly_list_qsort_uniq_x (SCM lst)
+{
+ int len = scm_ilength (lst);
+ SCM *arr = new SCM[len];
+ int k = 0;
+ for (SCM s = lst; SCM_NNULLP (s); s = SCM_CDR (s))
+ arr[k++] = SCM_CAR (s);
+
+ assert (k == len);
+ qsort (arr, len, sizeof (SCM), &scm_default_compare);
+
+ SCM *tail = &lst;
+ for (int i = 0; i < len; i++)
+ if (!i || arr[i] != arr[i - 1])
+ {
+ SCM_SETCAR (*tail, arr[i]);
+ tail = SCM_CDRLOC (*tail);
+ }
+
+ *tail = SCM_EOL;
+ delete[] arr;
+
+ return lst;
+}
+
+
/* tail add */
SCM
ly_snoc (SCM s, SCM list)
{
- return gh_append2 (list, scm_list_n (s, SCM_UNDEFINED));
+ return ly_append2 (list, scm_list_n (s, SCM_UNDEFINED));
}
-
/* Split list at member s, removing s.
- Return (BEFORE . AFTER) */
+ Return (BEFORE . AFTER) */
SCM
ly_split_list (SCM s, SCM list)
{
SCM before = SCM_EOL;
SCM after = list;
- for (; gh_pair_p (after);)
+ for (; ly_c_pair_p (after);)
{
SCM i = ly_car (after);
after = ly_cdr (after);
- if (gh_equal_p (i, s))
+ if (ly_c_equal_p (i, s))
break;
- before = gh_cons (i, before);
+ before = scm_cons (i, before);
}
- return gh_cons ( scm_reverse_x (before, SCM_EOL), after);
+ return scm_cons ( scm_reverse_x (before, SCM_EOL), after);
}
SCM
display_list (SCM s)
{
- SCM p = scm_current_output_port();
+ SCM p = scm_current_output_port ();
scm_puts ("(", p);
- for (; gh_pair_p(s); s =gh_cdr(s))
+ for (; ly_c_pair_p (s); s =ly_cdr (s))
{
- scm_display (gh_car(s), p);
+ scm_display (ly_car (s), p);
scm_puts (" ", p);
}
scm_puts (")", p);
{
Slice s;
s.set_empty ();
- for (; gh_pair_p (l); l = gh_cdr (l))
- {
- if (gh_number_p (gh_car (l)))
- s.add_point (gh_scm2int (gh_car (l)));
- }
-
+ for (; ly_c_pair_p (l); l = ly_cdr (l))
+ if (ly_c_number_p (ly_car (l)))
+ s.add_point (ly_scm2int (ly_car (l)));
return s;
}
+/* Return I-th element, or last elt L. If I < 0, then we take the first
+ element.
+
+ PRE: length (L) > 0 */
+SCM
+robust_list_ref (int i, SCM l)
+{
+ while (i-- > 0 && ly_c_pair_p (ly_cdr (l)))
+ l = ly_cdr (l);
+ return ly_car (l);
+}
-/*
- Return I-th element, or last elt L. If I < 0, then we take the first
- element.
+Real
+robust_scm2double (SCM k, double x)
+{
+ if (ly_c_number_p (k))
+ x = ly_scm2double (k);
+ return x;
+}
+
+Interval
+robust_scm2interval (SCM k, Drul_array<Real> v)
+{
+ Interval i;
+ i[LEFT]= v[LEFT];
+ i[RIGHT]= v[RIGHT];
+ if (is_number_pair (k))
+ i = ly_scm2interval (k);
+ return i;
+}
+
+Drul_array<Real>
+robust_scm2drul (SCM k, Drul_array<Real> v)
+{
+ if (is_number_pair (k))
+ v = ly_scm2interval (k);
+ return v;
+}
+
+Offset
+robust_scm2offset (SCM k, Offset o)
+{
+ if (is_number_pair (k))
+ o = ly_scm2offset (k);
+ return o;
+}
+
+int
+robust_scm2int (SCM k, int o)
+{
+ if (scm_integer_p (k) == SCM_BOOL_T)
+ o = ly_scm2int (k);
+ return o;
+}
- PRE: length (L) > 0
- */
SCM
-robust_list_ref(int i, SCM l)
+alist_to_hashq (SCM alist)
+{
+ int i = scm_ilength (alist);
+ if (i < 0)
+ return scm_make_vector (scm_int2num (0), SCM_EOL);
+
+ SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL);
+ for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s))
+ {
+ SCM pt = ly_cdar (s);
+ scm_hashq_set_x (tab, ly_caar (s), pt);
+ }
+ return tab;
+}
+
+#if 1
+/*
+ Debugging mem leaks:
+ */
+LY_DEFINE (ly_protects, "ly:protects",
+ 0, 0, 0, (),
+ "Return hash of protected objects.")
{
- while (i-- > 0 && gh_pair_p (gh_cdr(l)))
- l = gh_cdr (l);
+ return scm_protects;
+}
+#endif
+
+
+#ifdef HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+
+#include "pangofc-afm-decoder.hh"
- return gh_car(l);
+LY_DEFINE (ly_pango_add_afm_decoder, "ly:pango-add-afm-decoder",
+ 1, 0, 0, (SCM font_family),
+ "Add pango afm decoder for FONT-FAMILY.")
+{
+ SCM_ASSERT_TYPE (ly_c_string_p (font_family), font_family, SCM_ARG1, __FUNCTION__, "font_family");
+ pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0));
+ return SCM_UNSPECIFIED;
}
+#endif
projects / lilypond.git / blobdiff