/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2001--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 2001--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "parse-scm.hh"
#include "string-convert.hh"
#include "warn.hh"
+#include "lily-imports.hh"
+#include "protected-scm.hh"
bool debug_skylines;
bool debug_property_callbacks;
bool music_strings_to_paths;
bool relative_includes;
-/*
- Backwards compatibility.
-*/
-bool lily_1_8_relative = false;
-bool lily_1_8_compatibility_used = false;
bool profile_property_accesses = false;
/*
crash if internally the wrong type is used for a grob property.
bool do_internal_type_checking_global;
bool strict_infinity_checking = false;
-static SCM option_hash;
+static Protected_scm option_hash;
void
internal_set_option (SCM var,
be_safe_global = valbool;
val = val_scm_bool;
}
- else if (varstr == "old-relative")
- {
- lily_1_8_relative = valbool;
- /* Needs to be reset for each file that uses this option. */
- lily_1_8_compatibility_used = valbool;
- val = val_scm_bool;
- }
else if (varstr == "strict-infinity-checking")
{
strict_infinity_checking = valbool;
val = val_scm_bool;
}
else if (varstr == "warning-as-error")
- val = val_scm_bool;
+ {
+ /* warning_as_error is defined in flower/warn.cc */
+ warning_as_error = valbool;
+ val = val_scm_bool;
+ }
else if (varstr == "music-strings-to-paths")
{
music_strings_to_paths = valbool;
get_help_string ()
{
SCM alist = ly_hash2alist (option_hash);
- SCM converter = ly_lily_module_constant ("scm->string");
vector<string> opts;
string opt_spec = String_convert::char_string (' ', INDENT)
+ ly_symbol2string (sym)
+ " ("
- + ly_scm2string (scm_call_1 (converter, val))
+ + ly_scm2string (Lily::scm_to_string (val))
+ ")";
if (opt_spec.length () + SEPARATION > HELP_INDENT)
return help;
}
-LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 0, 0, (),
- "Print @code{ly:set-option} usage.")
+LY_DEFINE (ly_option_usage, "ly:option-usage", 0, 1, 0, (SCM port),
+ "Print @code{ly:set-option} usage. Optional @var{port} argument"
+ "for the destination defaults to current output port.")
{
- string help = get_help_string ();
- puts (help.c_str ());
- fflush (stdout);
+ SCM str = scm_from_locale_string (get_help_string ().c_str ());
+ scm_write_line (str, port);
return SCM_UNSPECIFIED;
}
"Add a program option @var{sym}. @var{val} is the default"
" value and @var{description} is a string description.")
{
- if (!option_hash)
- option_hash = scm_permanent_object (scm_c_make_hash_table (11));
+ if (!option_hash.is_bound ())
+ option_hash = scm_c_make_hash_table (11);
LY_ASSERT_TYPE (ly_is_symbol, sym, 1);
LY_ASSERT_TYPE (scm_is_string, description, 3);
{
LY_ASSERT_TYPE (ly_is_symbol, var, 1);
- if (val == SCM_UNDEFINED)
+ if (SCM_UNBNDP (val))
val = SCM_BOOL_T;
string varstr = robust_symbol2string (var, "");
}
SCM handle = scm_hashq_get_handle (option_hash, var);
- if (handle == SCM_BOOL_F)
+ if (scm_is_false (handle))
warning (_f ("no such internal option: %s", varstr.c_str ()));
internal_set_option (var, val);