/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org>
Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
{
LY_ASSERT_TYPE (scm_is_string, name, 1);
int sz = INT_MAX;
- if (size != SCM_UNDEFINED)
+ if (!SCM_UNBNDP (size))
{
LY_ASSERT_TYPE (scm_is_number, size, 2);
sz = scm_to_int (size);
}
string contents = gulp_file_to_string (ly_scm2string (name), true, sz);
- return scm_from_locale_stringn (contents.c_str (), contents.length ());
+ return scm_from_latin1_stringn (contents.c_str (), contents.length ());
}
-
LY_DEFINE (ly_dir_p, "ly:dir?",
1, 0, 0, (SCM s),
- "Is @var{s} a direction? Valid directions are @code{-1},"
- " @code{0}, or@tie{}@code{1}, where @code{-1} represents"
+ "Is @var{s} a direction? Valid directions are @w{@code{-1}},"
+ " @code{0}, or@tie{}@code{1}, where @w{@code{-1}} represents"
" left or down, @code{1}@tie{}represents right or up, and @code{0}"
" represents a neutral direction.")
{
- if (scm_is_number (s))
+ if (scm_is_integer (s))
{
int i = scm_to_int (s);
return (i >= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
if (scm_is_pair (handle))
return scm_cdr (handle);
- if (default_value == SCM_UNDEFINED)
+ if (SCM_UNBNDP (default_value))
default_value = SCM_BOOL_F;
- if (strict_checking == SCM_BOOL_T)
+ if (to_boolean (strict_checking))
{
string key_string = ly_scm2string
(scm_object_to_string (key, SCM_UNDEFINED));
1, 0, 0, (SCM str),
"Encode all characters in string @var{str} with hexadecimal"
" percent escape sequences, with the following exceptions:"
- " characters @code{-}, @code{.}, @code{/}, and @code{_}; and"
+ " characters @w{@code{-},} @code{.}, @code{/}, and @code{_}; and"
" characters in ranges @code{0-9}, @code{A-Z}, and @code{a-z}.")
{
LY_ASSERT_TYPE (scm_is_string, str, 1);
char str[400]; // ugh.
- if (scm_exact_p (s) == SCM_BOOL_F)
+ if (scm_is_false (scm_exact_p (s)))
{
Real r (scm_to_double (s));
if (isinf (r) || isnan (r))
{
- programming_error (_ ("infinity or NaN encountered while converting Real number"));
- programming_error (_ ("setting to zero"));
+ programming_error ("infinity or NaN encountered while converting Real number, "
+ "setting to zero");
r = 0.0;
}
else
snprintf (str, sizeof (str), "%d", int (scm_to_int (s)));
- return scm_from_locale_string (str);
+ return scm_from_ascii_string (str);
}
LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
"Return the unit used for lengths as a string.")
{
- return scm_from_locale_string (INTERNAL_UNIT);
+ return scm_from_ascii_string (INTERNAL_UNIT);
}
LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
0, 0, 0, (),
"Return hash of protected objects.")
{
+ //scm_protects is available only in Guile versions before 2.1.
+#if SCM_MAJOR_VERSION < 2 || SCM_MAJOR_VERSION == 2 && SCM_MINOR_VERSION < 1
return scm_protects;
+#else
+ return programming_error ("ly:protects is not supported in Guile 2.1");
+#endif
}
LY_DEFINE (ly_gettext, "ly:gettext",
return lst;
}
+LY_DEFINE (ly_bigpdfs, "ly:bigpdfs",
+ 0, 0, 0, (),
+ "Return true if the command line includes the @option{--bigpdf} parameter."
+)
+{
+ return bigpdfs ? SCM_BOOL_T : SCM_BOOL_F;
+}
+
LY_DEFINE (ly_wide_char_2_utf_8, "ly:wide-char->utf-8",
1, 0, 0, (SCM wc),
"Encode the Unicode codepoint @var{wc}, an integer, as UTF-8.")
}
*p = 0;
- return scm_from_locale_string (buf);
+ return scm_from_utf8_string (buf);
}
LY_DEFINE (ly_effective_prefix, "ly:effective-prefix",
return ly_chain_assoc_get (key, scm_cdr (achain), default_value);
}
- if (strict_checking == SCM_BOOL_T)
+ if (to_boolean (strict_checking))
{
string key_string = ly_scm2string
(scm_object_to_string (key, SCM_UNDEFINED));
+ default_value_string + "'.");
}
- return default_value == SCM_UNDEFINED ? SCM_BOOL_F : default_value;
+ return SCM_UNBNDP (default_value) ? SCM_BOOL_F : default_value;
}
LY_DEFINE (ly_stderr_redirect, "ly:stderr-redirect",
LY_ASSERT_TYPE (scm_is_string, file_name, 1);
string m = "w";
+ string f = ly_scm2string (file_name);
FILE *stderrfile;
- if (mode != SCM_UNDEFINED && scm_string_p (mode))
+ if (scm_is_string (mode))
m = ly_scm2string (mode);
/* dup2 and (fileno (current-error-port)) do not work with mingw'c
gcc -mwindows. */
fflush (stderr);
- stderrfile = freopen (ly_scm2string (file_name).c_str (), m.c_str (), stderr);
+ stderrfile = freopen (f.c_str (), m.c_str (), stderr);
+ if (!stderrfile)
+ error (_f ("failed redirecting stderr to `%s'", f.c_str ()));
return SCM_UNSPECIFIED;
}
string
format_single_argument (SCM arg, int precision, bool escape = false)
{
- if (scm_is_integer (arg) && scm_exact_p (arg) == SCM_BOOL_T)
+ if (scm_is_integer (arg) && scm_is_true (scm_exact_p (arg)))
return (String_convert::int_string (scm_to_int (arg)));
else if (scm_is_number (arg))
{
if (isnan (val) || isinf (val))
{
- warning (_ ("Found infinity or nan in output. Substituting 0.0"));
+ warning (_ ("Found infinity or nan in output. Substituting 0.0"));
return ("0.0");
if (strict_infinity_checking)
abort ();
return (ly_symbol2string (arg));
else
{
- ly_progress (scm_from_locale_string ("\nUnsupported SCM value for format: ~a"),
+ ly_progress (scm_from_ascii_string ("\nUnsupported SCM value for format: ~a"),
scm_list_1 (arg));
}
for (; scm_is_pair (s); s = scm_cdr (s))
{
results.push_back (format_single_argument (scm_car (s), precision));
- if (scm_cdr (s) != SCM_EOL)
+ if (!scm_is_null (scm_cdr (s)))
results.push_back (" ");
}
- if (s != SCM_EOL)
+ if (!scm_is_null (s))
results.push_back (format_single_argument (s, precision));
}
char *ptr = result;
for (vsize i = 0; i < results.size (); i++)
{
- strncpy (ptr, results[i].c_str (), results[i].size ());
+ // strcpy and strncpy cannot be used here
+ // because std::string may contain '\0' in its contents.
+ results[i].copy (ptr, results[i].size ());
ptr += results[i].size ();
}
*ptr = '\0';
standard_output, standard_error,
&exit_status, &error))
{
- fprintf (stderr, "failed (%d): %s: %s\n", exit_status, argv[0], error->message);
+ warning (_f ("g_spawn_sync failed (%d): %s: %s",
+ exit_status, argv[0], error->message));
g_error_free (error);
if (!exit_status)
exit_status = -1;
// Always get the pointer to the stdout/stderr messages
int exit_status = ly_run_command (argv, &standard_output, &standard_error);
- // Print out stdout and stderr only in debug mode
- debug_output (string ("\n") + standard_output + standard_error, true);
+ if (standard_output && standard_error)
+ {
+ // Print out stdout and stderr only in debug mode
+ debug_output (string ("\n") + standard_output + standard_error, true);
+ }
+
+ g_free (standard_error);
+ g_free (standard_output);
for (int i = 0; i < n; i++)
free (argv[i]);
projects / lilypond.git / blobdiff