#include "freetype.hh"
#include "getopt-long.hh"
#include "global-ctor.hh"
+#include "international.hh"
#include "lily-guile.hh"
#include "lily-version.hh"
#include "misc.hh"
#include "output-def.hh"
+#include "program-option.hh"
+#include "relocate.hh"
#include "string-convert.hh"
#include "version.hh"
#include "warn.hh"
-#include "program-option.hh"
-#include "relocate.hh"
/*
* Global options that can be overridden through command line.
*/
/* Names of header fields to be dumped to a separate file. */
-Array<String> dump_header_fieldnames_global;
+vector<string> dump_header_fieldnames_global;
/* Name of initialisation file. */
-String init_name_global;
+string init_name_global;
/* Selected output backend
One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */
-String output_backend_global = "ps";
+string output_backend_global = "ps";
+
/* Output formats to generate. */
-String output_format_global = "";
+string output_format_global = "";
bool is_pango_format_global;
bool is_TeX_format_global;
/* Current output name. */
-String output_name_global;
+string output_name_global;
/* Run in safe mode? */
bool be_safe_global = false;
/* Scheme code to execute before parsing, after .scm init.
This is where -e arguments are appended to. */
-String init_scheme_code_string;
-String init_scheme_variables;
+string init_scheme_code_string;
+string init_scheme_variables;
/* Generate preview of first system. */
bool make_preview = false;
bool relocate_binary =
-#if ARGV0_RELOCATION
+#if 1
true;
#else
false
/* Where the init files live. Typically:
LILYPOND_DATADIR = /usr/share/lilypond
*/
-String prefix_directory;
+string prefix_directory;
/* The jail specification: USER,GROUP,JAIL,DIR. */
-String jail_spec;
+string jail_spec;
/* The option parser */
static Getopt_long *option_parser = 0;
{0, 0, 0, 0}
};
-const char *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
+char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
static void
env_var_info (FILE *out, char const *key)
env_var_info (out, "GS_LIB");
env_var_info (out, "GUILE_LOAD_PATH");
env_var_info (out, "PANGO_RC_FILE");
+ env_var_info (out, "PANGO_PREFIX");
env_var_info (out, "PATH");
}
}
}
static void
-prepend_load_path (String dir)
+prepend_load_path (string dir)
{
- String s = "(set! %load-path (cons \"" + dir + "\" %load-path))";
+ string s = "(set! %load-path (cons \"" + dir + "\" %load-path))";
scm_c_eval_string (s.c_str ());
}
USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX
};
- Array<Std_string> components = String_convert::split (jail_spec, ',');
+ vector<string> components = string_split (jail_spec, ',');
if (components.size () != JAIL_MAX)
{
- error (_f ("expected %d arguments with jail, found: %d", JAIL_MAX,
- components.size ()));
+ error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX,
+ (unsigned) components.size ()));
exit (2);
}
+ init_scheme_variables + "))";
init_scheme_code_string
- += "(begin #t "
+ = "(begin #t "
+ init_scheme_variables
+ init_scheme_code_string
+ ")";
*tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
+
delete option_parser;
option_parser = 0;
Disable localisation of float values. This breaks TeX output. */
setlocale (LC_NUMERIC, "C");
- String localedir = LOCALEDIR;
+ string localedir = LOCALEDIR;
if (char const *env = getenv ("LILYPOND_LOCALEDIR"))
localedir = env;
}
static void
-add_output_format (String format)
+add_output_format (string format)
{
if (output_format_global != "")
output_format_global += ",";
switch (opt->shortname_char_)
{
case 0:
- if (String (opt->longname_str0_) == "dvi"
- || String (opt->longname_str0_) == "pdf"
- || String (opt->longname_str0_) == "png"
- || String (opt->longname_str0_) == "ps"
- || String (opt->longname_str0_) == "tex")
+ if (string (opt->longname_str0_) == "dvi"
+ || string (opt->longname_str0_) == "pdf"
+ || string (opt->longname_str0_) == "png"
+ || string (opt->longname_str0_) == "ps"
+ || string (opt->longname_str0_) == "tex")
add_output_format (opt->longname_str0_);
- else if (String (opt->longname_str0_) == "preview")
+ else if (string (opt->longname_str0_) == "preview")
make_preview = true;
- else if (String (opt->longname_str0_) == "no-pages")
+ else if (string (opt->longname_str0_) == "no-pages")
make_print = false;
- else if (String (opt->longname_str0_) == "relocate")
+ else if (string (opt->longname_str0_) == "relocate")
relocate_binary = true;
break;
case 'd':
{
- String arg (option_parser->optional_argument_str0_);
- int eq = arg.index ('=');
+ string arg (option_parser->optional_argument_str0_);
+ ssize eq = arg.find ('=');
- String key = arg;
- String val = "#t";
+ string key = arg;
+ string val = "#t";
- if (eq >= 0)
+ if (eq != NPOS)
{
- key = arg.left_string (eq);
- val = arg.right_string (arg.length () - eq - 1);
+ key = arg.substr (0, eq);
+ val = arg.substr (eq + 1, key.length () - 1);
}
init_scheme_variables
break;
case 'o':
{
- String s = option_parser->optional_argument_str0_;
+ string s = option_parser->optional_argument_str0_;
File_name file_name (s);
output_name_global = file_name.to_string ();
}
break;
case 'f':
- output_format_global = option_parser->optional_argument_str0_;
+ {
+ vector<string> components
+ = string_split (option_parser->optional_argument_str0_, ',');
+ for (vsize i = 0; i < components.size (); i++)
+ add_output_format (components[i]);
+ }
break;
case 'H':
dump_header_fieldnames_global
- .push (option_parser->optional_argument_str0_);
+ .push_back (option_parser->optional_argument_str0_);
break;
case 'I':
global_path.append (option_parser->optional_argument_str0_);
break;
case 's':
be_safe_global = true;
+ init_scheme_variables
+ += "(cons \'safe #t)\n";
+
break;
case 'p':
make_preview = true;
void
setup_guile_env ()
{
- char *yield = getenv ("LILYPOND_GC_YIELD");
+ const char *yield = getenv ("LILYPOND_GC_YIELD");
bool overwrite = true;
if (!yield)
{
sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
}
+void
+read_relocation_dir (string);
+
int
main (int argc, char **argv)
{
setup_paths (argv[0]);
setup_guile_env ();
- scm_boot_guile (argc, argv, main_with_guile, 0);
+
+ /* Debugging aid. */
+ try
+ {
+ scm_boot_guile (argc, argv, main_with_guile, 0);
+ }
+ catch (exception e)
+ {
+ error (_f ("exception caught: %s", e.what ()));
+ };
/* Only reachable if GUILE exits. That is an error. */
return 1;