source file of the GNU LilyPond music typesetter
- (c) 1998--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 1998--2003 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 "lily-proto.hh"
+
+/* macosx fix:
+
+
+ source-file.hh includes cmath which undefines isinf and isnan
+*/
+inline int my_isinf(Real r) { return isinf(r); }
+inline int my_isnan(Real r) { return isnan(r); }
+
+
+
#include "libc-extension.hh"
#include "lily-guile.hh"
#include "main.hh"
-#include "simple-file-storage.hh"
#include "file-path.hh"
#include "warn.hh"
#include "direction.hh"
#include "interval.hh"
#include "pitch.hh"
#include "dimensions.hh"
-
+#include "source-file.hh"
// #define TEST_GC
-#ifdef PARANOID
-#include <libguile/gc.h>
-#undef gh_pair_p
-bool
-ly_pair_p (SCM x)
-{
-#if 0
- assert (!SCM_CONSP (x) || (*(scm_t_bits*) SCM2PTR (SCM_CAR (x))) != scm_tc_free_cell);
- assert (!SCM_CONSP (x) || (*(scm_t_bits*) SCM2PTR (SCM_CDR (x))) != scm_tc_free_cell);
-#elif GUILE_MINOR_VERSION < 5
- assert (!SCM_CONSP (x) || !SCM_FREEP (SCM_CAR (x)));
- assert (!SCM_CONSP (x) || !SCM_FREEP (SCM_CDR (x)));
-#else
- assert (!SCM_CONSP (x) || !SCM_FREE_CELL_P (SCM_CAR (x)));
- assert (!SCM_CONSP (x) || !SCM_FREE_CELL_P (SCM_CDR (x)));
-#endif
- //return SCM_NFALSEP (scm_pair_p (x));
- return gh_pair_p (x);
-}
-#define gh_pair_p ly_pair_p
-#endif
-
SCM
ly_last (SCM list)
{
return scm_list_n (ly_symbol2scm ("quote"), s, SCM_UNDEFINED);
}
-
-
String
ly_symbol2string (SCM s)
{
return String ((Byte*)SCM_STRING_CHARS (s), (int) SCM_STRING_LENGTH (s));
}
-
String
gulp_file_to_string (String fn)
{
{
String e = _f ("can't find file: `%s'", fn);
e += " ";
- e += _f ("(load path: `%s')", global_path.string ());
+ e += _f ("(load path: `%s')", global_path.to_string ());
error (e);
}
else if (verbose_global_b)
progress_indication ("[" + s);
-
- Simple_file_storage f (s);
- String result (f.to_str0 ());
+ int n;
+ char * str = gulp_file (s, &n);
+ String result (str);
+ delete[] str;
+
if (verbose_global_b)
progress_indication ("]");
+
return result;
}
-LY_DEFINE(ly_gulp_file, "ly-gulp-file", 1,0, 0,
+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.
-
-")
+ "Read the file named @var{name}, and return its contents in a string. The "
+" file is looked up using the lilypond search path.")
{
return scm_makfrom0str (gulp_file_to_string (ly_scm2string (name)).to_str0 ());
}
SCM
index_get_cell (SCM s, Direction d)
{
+
assert (d);
return (d == LEFT) ? ly_car (s) : ly_cdr (s);
}
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}.")
{
- assert (gh_string_p (str));
+ SCM_ASSERT_TYPE (gh_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
warning ("lily-guile: " + ly_scm2string (str));
return SCM_BOOL_T;
}
-LY_DEFINE(ly_isdir, "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 a -1, 0 or 1, where -1 represents "
+ "left or down and 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));
}
scm_init_funcs_->push (f);
}
-extern void init_cxx_function_smobs ();
-
void
-ly_init_guile ()
+ly_init_ly_module (void *data)
{
- SCM last_mod = scm_current_module ();
- scm_set_current_module (scm_c_resolve_module ("guile"));
-
- init_cxx_function_smobs ();
for (int i=scm_init_funcs_->size () ; i--;)
(scm_init_funcs_->elem (i)) ();
if (verbose_global_b)
progress_indication ("\n");
+
+ scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
+}
- scm_primitive_load_path (scm_makfrom0str ("lily.scm"));
+SCM lily_module ;
- scm_set_current_module (last_mod);
+void
+ly_init_guile ()
+{
+ lily_module = scm_c_define_module ("lily", ly_init_ly_module, 0);
+ scm_c_use_module ("lily");
}
unsigned int ly_scm_hash (SCM s)
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))
{
Direction
to_dir (SCM s)
{
- return (Direction) gh_scm2int (s);
+ return SCM_INUMP (s) ? (Direction) gh_scm2int (s) : CENTER;
}
Interval
gh_scm2double (ly_cdr (s)));
}
-SCM
-ly_type (SCM exp)
-{
- char const * cp = "unknown";
- if (gh_number_p (exp))
- {
- cp = "number";
- }
- else if (gh_string_p (exp))
- {
- cp = "string";
- }
- else if (gh_procedure_p (exp))
- {
- cp = "procedure";
- }
- else if (gh_boolean_p (exp))
- {
- cp = "boolean";
- }
- else if (gh_pair_p (exp))
- {
- cp = "list";
- }
-
- return scm_makfrom0str (cp);
-}
-
-/*
- convert without too many decimals, and leave a space at the end.
- */
-
-LY_DEFINE(ly_number2string, "ly-number->string", 1, 0,0,
+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.
-")
+ " converts @var{num} to a string without generating many decimals. It "
+"leaves a space at the end.")
{
- assert (gh_number_p (s));
+ SCM_ASSERT_TYPE (gh_number_p (s), s, SCM_ARG1, __FUNCTION__, "number");
char str[400]; // ugh.
{
Real r (gh_scm2double (s));
- if (isinf (r) || isnan (r))
+ if (my_isinf (r) || my_isnan (r))
{
programming_error ("Infinity or NaN encountered while converting Real number; setting to zero.");
r = 0.0;
Undef this to see if GUILE GC is causing too many swaps.
*/
-// #define TEST_GC
+//#define TEST_GC
#ifdef TEST_GC
#include <libguile/gc.h>
#include "version.hh"
-LY_DEFINE(ly_version, "ly-version", 0, 0, 0, (),
- "Return the current lilypond version as a list, e.g.
-@code{(1 3 127 uu1)}.
-")
+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_verbose, "ly-verbose", 0, 0, 0, (),
- "Return whether lilypond is being run in verbose mode.")
+
+
+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 gh_bool2scm (verbose_global_b);
+ return scm_number_p (d);
}
static void
if (val == SCM_EOL || val == SCM_BOOL_F)
return ok;
-
- SCM type = SCM_EOL;
+ if (!gh_symbol_p (sym))
+#if 0
+ return false;
+#else
+ /*
+ This is used for autoBeamSettings.
- if (gh_symbol_p (sym))
- type = scm_object_property (sym, type_symbol);
+ TODO: deprecate the use of \override and \revert for
+ autoBeamSettings?
+ */
+ return true;
+#endif
+
+ SCM type = scm_object_property (sym, type_symbol);
if (type != SCM_EOL && !gh_procedure_p (type))
{
- warning (_f ("Can't find property type-check for `%s' (%s). Perhaps you made a typing error? Doing assignment anyway.",
+ warning (_f ("Can't find property type-check for `%s' (%s).",
ly_symbol2string (sym).to_str0 (),
- ly_symbol2string (type_symbol).to_str0 ()
-
- ));
+ ly_symbol2string (type_symbol).to_str0 ())
+ + " " + _ ("Perhaps you made a typing error?"));
+
+ /* Be strict when being anal :) */
+ if (internal_type_checking_global_b)
+ abort ();
+
+ warning (_ ("Doing assignment anyway."));
}
else
{
return gh_car(l);
}
+
projects / lilypond.git / blobdiff