source file of the GNU LilyPond music typesetter
(c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-
- Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
+#include "lily-guile.hh"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
#include <math.h> /* isinf */
-#include <string.h> /* strdup, strchr */
-#include <ctype.h>
+#include <cstring> /* strdup, strchr */
+#include <cctype>
+
+#include <libintl.h> // gettext on macos x
-#include "lily-proto.hh"
#include "version.hh"
/* MacOS S fix:
source-file.hh includes cmath which undefines isinf and isnan
-
- FIXME: #ifdef MACOS_X?
*/
+#ifdef __APPLE__
inline int my_isinf (Real r) { return isinf (r); }
inline int my_isnan (Real r) { return isnan (r); }
-
+#endif
#include "libc-extension.hh"
-#include "lily-guile.hh"
#include "main.hh"
#include "file-path.hh"
#include "warn.hh"
#include "direction.hh"
#include "offset.hh"
-#include "interval.hh"
#include "pitch.hh"
#include "dimensions.hh"
#include "source-file.hh"
// #define TEST_GC
SCM
-ly_last (SCM list)
+ly_to_symbol (SCM scm)
{
- return ly_car (scm_last_pair (list));
+ return scm_string_to_symbol (ly_to_string (scm));
}
+SCM
+ly_to_string (SCM scm)
+{
+ return scm_call_3 (ly_scheme_function ("format"), SCM_BOOL_F,
+ scm_makfrom0str ("~S"), scm);
+}
+
+SCM
+ly_last (SCM list)
+{
+ return scm_car (scm_last_pair (list));
+}
SCM
ly_write2scm (SCM s)
return scm_strport_to_string (port);
}
-
SCM
ly_quote_scm (SCM s)
{
String
ly_symbol2string (SCM s)
{
- assert (ly_symbol_p (s));
- return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
+ /*
+ Ugh. this is not very efficient.
+ */
+ SCM str = scm_symbol_to_string (s);
+ return ly_scm2string (str);
}
String
-gulp_file_to_string (String fn)
+gulp_file_to_string (String fn, bool must_exist)
{
String s = global_path.find (fn);
if (s == "")
{
- String e = _f ("can't find file: `%s'", fn);
- e += " ";
- e += _f ("(load path: `%s')", global_path.to_string ());
- error (e);
+ if (must_exist)
+ {
+ String e = _f ("can't find file: `%s'", fn);
+ e += " ";
+ e += _f ("(load path: `%s')", global_path.to_string ());
+ error (e);
+ /* unreachable */
+ }
+ return s;
}
- else if (verbose_global_b)
+
+ if (verbose_global_b)
progress_indication ("[" + s);
int n;
- char * str = gulp_file (s, &n);
- String result (str);
+ char *str = gulp_file (s, &n);
+ String result ((Byte*) str, n);
delete[] str;
if (verbose_global_b)
"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_string_p (name), name, SCM_ARG1, __FUNCTION__, "string");
- return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ());
+ SCM_ASSERT_TYPE (scm_is_string (name), name, SCM_ARG1, __FUNCTION__, "string");
+ String contents = gulp_file_to_string (ly_scm2string (name), true);
+ return scm_from_locale_stringn (contents.get_str0 (), contents.length ());
}
};
String
-ly_scm2string (SCM s)
+ly_scm2string (SCM str)
{
- assert (ly_string_p (s));
-
- char *p = SCM_STRING_CHARS (s);
- String r (p);
- return r;
+ assert (scm_is_string (str));
+ return String ((Byte*)scm_i_string_chars (str),
+ (int) scm_i_string_length (str));
}
char *
ly_scm2newstr (SCM str, size_t *lenp)
{
- char *new_str;
- size_t len;
-
- SCM_ASSERT_TYPE (ly_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
- len = SCM_STRING_LENGTH (str);
- new_str = (char *) malloc ((len + 1) * sizeof (char));
-
- if (new_str == NULL)
- return NULL;
-
- memcpy (new_str, SCM_STRING_CHARS (str), len);
- new_str[len] = '\0';
-
- if (lenp != NULL)
- *lenp = len;
+ size_t len = SCM_STRING_LENGTH (str);
+ if (char *new_str = (char *) malloc ((len + 1) * sizeof (char)))
+ {
+ memcpy (new_str, scm_i_string_chars (str), len);
+ new_str[len] = '\0';
- return new_str;
+ if (lenp)
+ *lenp = len;
+
+ return new_str;
+ }
+ return 0;
}
SCM
{
assert (d);
- return (d == LEFT) ? ly_car (s) : ly_cdr (s);
+ return (d == LEFT) ? scm_car (s) : scm_cdr (s);
}
SCM
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, 1, (SCM str, SCM rest),
+ "Scheme callable function to issue the warning @code{msg}. "
+ "The message is formatted with @code{format} and @code{rest}.")
{
- SCM_ASSERT_TYPE (ly_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
progress_indication ("\n");
+
+ str = scm_simple_format (SCM_BOOL_F, str, rest);
warning ("lily-guile: " + ly_scm2string (str));
- return SCM_BOOL_T;
+ return SCM_UNSPECIFIED;
+}
+
+LY_DEFINE (ly_programming_error, "ly:programming-error",
+ 1, 0, 1, (SCM str, SCM rest),
+ "Scheme callable function to issue the warning @code{msg}. "
+ "The message is formatted with @code{format} and @code{rest}.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (str), str, SCM_ARG1, __FUNCTION__, "string");
+ progress_indication ("\n");
+
+ str = scm_simple_format (SCM_BOOL_F, str, rest);
+ programming_error (ly_scm2string (str));
+ return SCM_UNSPECIFIED;
}
-LY_DEFINE (ly_dir_p, "ly:dir?", 1,0, 0, (SCM s),
+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 (ly_number_p (s))
+ if (scm_is_number (s))
{
- int i = ly_scm2int (s);
+ int i = scm_to_int (s);
return (i>= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
}
return SCM_BOOL_F;
bool
is_number_pair (SCM p)
{
- return ly_pair_p (p) && ly_number_p (ly_car (p)) && ly_number_p (ly_cdr (p));
+ return scm_is_pair (p)
+ && scm_is_number (scm_car (p)) && scm_is_number (scm_cdr (p));
}
typedef void (*Void_fptr) ();
scm_init_funcs_->push (f);
}
-
void
ly_init_ly_module (void *)
{
- for (int i=scm_init_funcs_->size () ; i--;)
+ for (int i = scm_init_funcs_->size () ; i--;)
(scm_init_funcs_->elem (i)) ();
if (verbose_global_b)
scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
}
-
SCM global_lily_module;
void
-ly_init_guile ()
+ly_c_init_guile ()
{
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 (ly_number_p (s))
+ if (scm_is_number (s))
{
- int i = ly_scm2int (s);
+ int i = scm_to_int (s);
return i>= -1 && i <= 1;
}
return false;
}
+LY_DEFINE (ly_assoc_get, "ly:assoc-get",
+ 2, 1, 0,
+ (SCM key, SCM alist, SCM default_value),
+ "Return value if KEY in ALIST, else DEFAULT-VALUE "
+ "(or #f if not specified).")
+{
+ SCM handle = scm_assoc (key, alist);
+
+ if (default_value == SCM_UNDEFINED)
+ default_value = SCM_BOOL_F;
+
+ if (scm_is_pair (handle))
+ return scm_cdr (handle);
+ else
+ return default_value;
+}
bool
is_axis (SCM s)
{
- if (ly_number_p (s))
+ if (scm_is_number (s))
{
- int i = ly_scm2int (s);
- return i== 0 || i == 1;
+ int i = scm_to_int (s);
+ return i == 0 || i == 1;
}
return false;
}
Direction
to_dir (SCM s)
{
- return SCM_INUMP (s) ? (Direction) ly_scm2int (s) : CENTER;
+ return scm_is_integer (s) ? (Direction) scm_to_int (s) : CENTER;
}
Interval
ly_scm2interval (SCM p)
{
- return Interval (ly_scm2double (ly_car (p)), ly_scm2double (ly_cdr (p)));
+ return Interval (scm_to_double (scm_car (p)), scm_to_double (scm_cdr (p)));
}
Drul_array<Real>
ly_scm2realdrul (SCM p)
{
- return Drul_array<Real> (ly_scm2double (ly_car (p)),
- ly_scm2double (ly_cdr (p)));
+ return Drul_array<Real> (scm_to_double (scm_car (p)),
+ scm_to_double (scm_cdr (p)));
}
SCM
bool
to_boolean (SCM s)
{
- return ly_boolean_p (s) && ly_scm2bool (s);
+ return scm_is_bool (s) && ly_scm2bool (s);
}
/* Appendable list L: the cdr contains the list, the car the last cons
{
SCM newcons = scm_cons (elt, SCM_EOL);
- scm_set_cdr_x (ly_car (l), newcons);
+ scm_set_cdr_x (scm_car (l), newcons);
scm_set_car_x (l, newcons);
}
-
SCM
ly_offset2scm (Offset o)
{
Offset
ly_scm2offset (SCM s)
{
- return Offset (ly_scm2double (ly_car (s)),
- ly_scm2double (ly_cdr (s)));
+ return Offset (scm_to_double (scm_car (s)),
+ scm_to_double (scm_cdr (s)));
}
-
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 (ly_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
+ SCM_ASSERT_TYPE (scm_is_number (s), s, SCM_ARG1, __FUNCTION__, "number");
char str[400]; // ugh.
if (scm_exact_p (s) == SCM_BOOL_F)
{
- Real r (ly_scm2double (s));
-
+ Real r (scm_to_double (s));
+#ifdef __APPLE__
if (my_isinf (r) || my_isnan (r))
+#else
+ if (isinf (r) || isnan (r))
+#endif
{
programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
r = 0.0;
sprintf (str, "%08.4f", r);
}
else
- sprintf (str, "%d", ly_scm2int (s));
+ sprintf (str, "%d", scm_to_int (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
LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
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 (ly_pair_p (src))
- return scm_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src)));
- else if (ly_vector_p (src))
+ if (scm_is_pair (src))
+ return scm_cons (ly_deep_copy (scm_car (src)), ly_deep_copy (scm_cdr (src)));
+ else if (ly_c_vector_p (src))
{
int len = SCM_VECTOR_LENGTH (src);
SCM nv = scm_c_make_vector (len, SCM_UNDEFINED);
- for (int i =0 ; i < len ; i++)
+ for (int i = 0 ;i < len ; i++)
{
SCM si = scm_int2num (i);
scm_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
SCM
ly_assoc_chain (SCM key, SCM achain)
{
- if (ly_pair_p (achain))
+ if (scm_is_pair (achain))
{
- SCM handle = scm_assoc (key, ly_car (achain));
- if (ly_pair_p (handle))
+ SCM handle = scm_assoc (key, scm_car (achain));
+ if (scm_is_pair (handle))
return handle;
else
- return ly_assoc_chain (key, ly_cdr (achain));
+ return ly_assoc_chain (key, scm_cdr (achain));
}
else
return SCM_BOOL_F;
SCM
ly_assoc_cdr (SCM key, SCM alist)
{
- if (ly_pair_p (alist))
+ if (scm_is_pair (alist))
{
- SCM trykey = ly_caar (alist);
- if (ly_pair_p (trykey) && to_boolean (scm_equal_p (key, ly_cdr (trykey))))
- return ly_car (alist);
+ SCM trykey = scm_caar (alist);
+ if (scm_is_pair (trykey) && to_boolean (scm_equal_p (key, scm_cdr (trykey))))
+ return scm_car (alist);
else
- return ly_assoc_cdr (key, ly_cdr (alist));
+ return ly_assoc_cdr (key, scm_cdr (alist));
}
return SCM_BOOL_F;
}
{
SCM s = lst;
k--;
- for (; ly_pair_p (s) && k--; s = ly_cdr (s))
+ for (; scm_is_pair (s) && k--; s = scm_cdr (s))
;
- if (ly_pair_p (s))
+ if (scm_is_pair (s))
scm_set_cdr_x (s, SCM_EOL);
}
return lst;
if (val == SCM_EOL || val == SCM_BOOL_F)
return ok;
- if (!ly_symbol_p (sym))
+ if (!scm_is_symbol (sym))
#if 0
return false;
#else
SCM type = scm_object_property (sym, type_symbol);
- if (type != SCM_EOL && !ly_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
- && ly_procedure_p (type)
+ && ly_c_procedure_p (type)
&& scm_call_1 (type, val) == SCM_BOOL_F)
{
SCM errport = scm_current_error_port ();
ly_unique (SCM list)
{
SCM unique = SCM_EOL;
- for (SCM i = list; ly_pair_p (i); i = ly_cdr (i))
+ for (SCM i = list; scm_is_pair (i); i = scm_cdr (i))
{
- if (!ly_pair_p (ly_cdr (i))
- || !ly_equal_p (ly_car (i), ly_cadr (i)))
- unique = scm_cons (ly_car (i), unique);
+ if (!scm_is_pair (scm_cdr (i))
+ || !ly_c_equal_p (scm_car (i), scm_cadr (i)))
+ unique = scm_cons (scm_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)
{
SCM before = SCM_EOL;
SCM after = list;
- for (; ly_pair_p (after);)
+ for (; scm_is_pair (after);)
{
- SCM i = ly_car (after);
- after = ly_cdr (after);
- if (ly_equal_p (i, s))
+ SCM i = scm_car (after);
+ after = scm_cdr (after);
+ if (ly_c_equal_p (i, s))
break;
before = scm_cons (i, before);
}
SCM p = scm_current_output_port ();
scm_puts ("(", p);
- for (; ly_pair_p (s); s =ly_cdr (s))
+ for (; scm_is_pair (s); s = scm_cdr (s))
{
- scm_display (ly_car (s), p);
+ scm_display (scm_car (s), p);
scm_puts (" ", p);
}
scm_puts (")", p);
{
Slice s;
s.set_empty ();
- for (; ly_pair_p (l); l = ly_cdr (l))
- if (ly_number_p (ly_car (l)))
- s.add_point (ly_scm2int (ly_car (l)));
+ for (; scm_is_pair (l); l = scm_cdr (l))
+ if (scm_is_number (scm_car (l)))
+ s.add_point (scm_to_int (scm_car (l)));
return s;
}
SCM
robust_list_ref (int i, SCM l)
{
- while (i-- > 0 && ly_pair_p (ly_cdr (l)))
- l = ly_cdr (l);
- return ly_car (l);
+ while (i-- > 0 && scm_is_pair (scm_cdr (l)))
+ l = scm_cdr (l);
+ return scm_car (l);
}
Real
robust_scm2double (SCM k, double x)
{
- if (ly_number_p (k))
- x = ly_scm2double (k);
+ if (scm_is_number (k))
+ x = scm_to_double (k);
return x;
}
robust_scm2int (SCM k, int o)
{
if (scm_integer_p (k) == SCM_BOOL_T)
- o = ly_scm2int (k);
+ o = scm_to_int (k);
return o;
}
{
int i = scm_ilength (alist);
if (i < 0)
- return scm_make_vector (scm_int2num (0), SCM_EOL);
+ return scm_c_make_hash_table (0);
- SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL);
- for (SCM s = alist; ly_pair_p (s); s = ly_cdr (s))
+ SCM tab = scm_c_make_hash_table (i);
+ for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s))
{
- SCM pt = ly_cdar (s);
- scm_hashq_set_x (tab, ly_caar (s), pt);
+ SCM pt = scm_cdar (s);
+ scm_hashq_set_x (tab, scm_caar (s), pt);
}
return tab;
}
/*
Debugging mem leaks:
*/
-LY_DEFINE (ly_protects, "ly:protects", 0, 0, 0, (),
+LY_DEFINE (ly_protects, "ly:protects",
+ 0, 0, 0, (),
"Return hash of protected objects.")
{
return scm_protects;
}
#endif
+
+
+#if HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC
+
+#include "pangofc-afm-decoder.hh"
+
+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 (scm_is_string (font_family), font_family, SCM_ARG1,
+ __FUNCTION__, "font_family");
+ pango_fc_afm_add_decoder (ly_scm2newstr (font_family, 0));
+ return SCM_UNSPECIFIED;
+}
+
+#endif
+
+LY_DEFINE (ly_gettext, "ly:gettext",
+ 1, 0, 0, (SCM string),
+ "Gettext wrapper.")
+{
+ SCM_ASSERT_TYPE (scm_is_string (string), string, SCM_ARG1,
+ __FUNCTION__, "string");
+ return scm_makfrom0str (gettext (scm_i_string_chars (string)));
+}
+
projects / lilypond.git / blobdiff