source file of the GNU LilyPond music typesetter
- (c) 1998--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2004 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <stdlib.h>
#include <math.h> /* isinf */
#include <string.h> /* strdup, strchr */
-
+#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"
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 (gh_string_p (name), name, SCM_ARG1, __FUNCTION__, "string");
return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ());
}
{
assert (gh_string_p (s));
- char *p = SCM_STRING_CHARS(s);
+ char *p = SCM_STRING_CHARS (s);
String r (p);
return r;
}
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_warning,"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");
+ progress_indication ("\n");
warning ("lily-guile: " + ly_scm2string (str));
return SCM_BOOL_T;
}
-LY_DEFINE(ly_isdir, "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))
{
}
bool
-ly_number_pair_p (SCM p)
+is_number_pair (SCM p)
{
return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
}
void
-ly_init_ly_module (void *data)
+ly_init_ly_module (void *)
{
for (int i=scm_init_funcs_->size () ; i--;)
(scm_init_funcs_->elem (i)) ();
}
-SCM lily_module ;
+SCM global_lily_module;
void
ly_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");
}
bool
-ly_dir_p (SCM s)
+is_direction (SCM s)
{
if (gh_number_p (s))
{
bool
-ly_axis_p (SCM s)
+is_axis (SCM s)
{
if (gh_number_p (s))
{
return false;
}
-
Direction
to_dir (SCM s)
{
- return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER;
+ return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER;
}
Interval
ly_scm2interval (SCM p)
{
- return Interval (gh_scm2double (ly_car (p)),
- gh_scm2double (ly_cdr (p)));
+ return Interval (gh_scm2double (ly_car (p)), gh_scm2double (ly_cdr (p)));
+}
+
+Drul_array<Real>
+ly_scm2realdrul (SCM p)
+{
+ return Drul_array<Real> (gh_scm2double (ly_car (p)),
+ gh_scm2double (ly_cdr (p)));
}
SCM
ly_interval2scm (Drul_array<Real> i)
{
- return gh_cons (gh_double2scm (i[LEFT]),
- gh_double2scm (i[RIGHT]));
+ return gh_cons (gh_double2scm (i[LEFT]), gh_double2scm (i[RIGHT]));
}
-
-
-
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.
- */
+/* Appendable list L: the cdr contains the list, the car the last cons
+ in the list. */
SCM
appendable_list ()
{
}
-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");
r = 0.0;
}
- sprintf (str, "%8.4f ", r);
+ sprintf (str, "%08.4f", r);
}
else
- {
- sprintf (str, "%d ", gh_scm2int (s));
- }
+ sprintf (str, "%d", gh_scm2int (s));
return scm_makfrom0str (str);
}
static void *
greet_sweep (void *dummy1, void *dummy2, void *dummy3)
{
- fprintf (stderr, "entering sweep\n");
+ fprintf (stderr, "entering sweep\n");
}
static void *
wave_sweep_goodbye (void *dummy1, void *dummy2, void *dummy3)
{
- fprintf (stderr, "leaving sweep\n");
+ 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);
}
-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.")
{
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)));
- }
+ return gh_cons (ly_deep_copy (ly_car (src)), ly_deep_copy (ly_cdr (src)));
else if (gh_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_vector_set_x (nv, si, ly_deep_copy (scm_vector_ref (src, si)));
}
}
- else
- return src;
-
return src;
}
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);
+ 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));
+ return ly_assoc_cdr (key, ly_cdr (alist));
}
- else
- return SCM_BOOL_F;
+ 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;
+
for (char * p = s; *p; p++)
- {
- if (*p == '\n')
- *p = ' ' ;
- }
+ if (*p == '\n')
+ *p = ' ';
- if (!s[0] )
+ if (!s[0])
s = 0;
-
-
while (s)
{
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))
;
if (gh_pair_p (s))
- {
- gh_set_cdr_x (s, SCM_EOL);
- }
+ gh_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;
}
TODO: deprecate the use of \override and \revert for
autoBeamSettings?
+
+ or use a symbol autoBeamSettingS?
*/
return true;
#endif
{
SCM errport = scm_current_error_port ();
ok = false;
- SCM typefunc = scm_primitive_eval (ly_symbol2scm ("type-name"));
+ SCM typefunc = ly_scheme_function ("type-name");
SCM type_name = gh_call1 (typefunc, type);
return gh_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
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 (; gh_pair_p (s); s =gh_cdr (s))
{
- scm_display (gh_car(s), p);
+ scm_display (gh_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)));
- }
-
+ if (gh_number_p (gh_car (l)))
+ s.add_point (gh_scm2int (gh_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 && gh_pair_p (gh_cdr (l)))
+ l = gh_cdr (l);
+ return gh_car (l);
+}
+Real
+robust_scm2double (SCM k, double x)
+{
+ if (gh_number_p (k))
+ x = gh_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;
+}
-/*
- Return I-th element, or last elt L. If I < 0, then we take the first
- element.
+Drul_array<Real>
+robust_scm2drul (SCM k, Drul_array<Real> v)
+{
+ if (is_number_pair (k))
+ v = ly_scm2interval (k);
+ return v;
+}
- PRE: length (L) > 0
- */
-SCM
-robust_list_ref(int i, SCM l)
+Offset
+robust_scm2offset (SCM k, Offset o)
{
- while (i-- > 0 && gh_pair_p (gh_cdr(l)))
- l = gh_cdr (l);
+ 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 = gh_scm2int (k);
+ return o;
+}
- return gh_car(l);
+SCM
+alist_to_hashq (SCM alist)
+{
+ int i = scm_ilength (alist);
+ if (i < 0)
+ return scm_make_vector (gh_int2scm (0), SCM_EOL);
+
+ SCM tab = scm_make_vector (gh_int2scm (i), SCM_EOL);
+ for (SCM s = alist; gh_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.")
+{
+ return scm_protects;
+}
+#endif