source file of the GNU LilyPond music typesetter
- (c) 1997--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "main.hh"
/* 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_global;
+string init_scheme_variables_global;
/* Generate preview of first system. */
bool make_preview = false;
static Long_option_init options_static[]
= {
- {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")},
+ {_i ("BACK"), "backend", 'b', _i ("use backend BACK (eps, gnome, ps [default],\nscm, svg, tex, texstr)")},
- {_i ("SYM=VAL"), "define-default", 'd',
- _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
- "Try -dhelp for help.")},
+ {_i ("SYM[=VAL]"), "define-default", 'd',
+ _i ("set Scheme option SYM to VAL (default: #t).\n"
+ "Use -dhelp for help.")},
{_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")},
/* Bug in option parser: --output =foe is taken as an abbreviation
for --output-format. */
{_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,... Also as separate options:")},
{0, "dvi", 0, _i ("generate DVI (tex backend only)")},
- {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
{0, "pdf", 0, _i ("generate PDF (default)")},
{0, "png", 0, _i ("generate PNG")},
{0, "ps", 0, _i ("generate PostScript")},
{0, "tex", 0, _i ("generate TeX (tex backend only)")},
- {0, "help", 'h', _i ("print this help")},
- {_i ("FIELD"), "header", 'H', _i ("dump a header field to file BASENAME.FIELD")},
+ {0, "help", 'h', _i ("show this help and exit")},
+ {_i ("FIELD"), "header", 'H', _i ("dump header field FIELD to file\n"
+ "named BASENAME.FIELD")},
{_i ("DIR"), "include", 'I', _i ("add DIR to search path")},
{_i ("FILE"), "init", 'i', _i ("use FILE as init file")},
#if HAVE_CHROOT
{0, "no-print", 0, _i ("do not generate printed output")},
{_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")},
{0, "preview", 'p', _i ("generate a preview of the first system")},
- {0, "safe-mode", 's', _i ("disallow unsafe Scheme and PostScript operations")},
- {0, "version", 'v', _i ("print version number")},
+ {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
+ {0, "version", 'v', _i ("show version number and exit")},
{0, "verbose", 'V', _i ("be verbose")},
{0, "warranty", 'w', _i ("show warranty and copyright")},
{0, 0, 0, 0}
copyright ()
{
printf (_f ("Copyright (c) %s by\n%s and others.",
- "1996--2006",
+ "1996--2007",
AUTHORS).c_str ());
printf ("\n");
}
if (errno == 0)
error (_f ("no such user: %s", components[USER_NAME]));
else
- error (_f ("can't get user id from user name: %s: %s",
+ error (_f ("cannot get user id from user name: %s: %s",
components[USER_NAME],
strerror (errno)));
exit (3);
if (errno == 0)
error (_f ("no such group: %s", components[GROUP_NAME]));
else
- error (_f ("can't get group id from group name: %s: %s",
+ error (_f ("cannot get group id from group name: %s: %s",
components[GROUP_NAME],
strerror (errno)));
exit (3);
if (chroot (components[JAIL].c_str ()))
{
- error (_f ("can't chroot to: %s: %s", components[JAIL],
+ error (_f ("cannot chroot to: %s: %s", components[JAIL],
strerror (errno)));
exit (3);
}
if (setgid (gid))
{
- error (_f ("can't change group id to: %d: %s", gid, strerror (errno)));
+ error (_f ("cannot change group id to: %d: %s", gid, strerror (errno)));
exit (3);
}
if (setuid (uid))
{
- error (_f ("can't change user id to: %d: %s", uid, strerror (errno)));
+ error (_f ("cannot change user id to: %d: %s", uid, strerror (errno)));
exit (3);
}
if (chdir (components[DIR].c_str ()))
{
- error (_f ("can't change working directory to: %s: %s", components[DIR],
+ error (_f ("cannot change working directory to: %s: %s", components[DIR],
strerror (errno)));
exit (3);
}
|| output_backend_global == "texstr");
is_pango_format_global = !is_TeX_format_global;
+ init_scheme_variables_global = "(list " + init_scheme_variables_global + ")";
+ init_scheme_code_global = "(begin " + init_scheme_code_global + ")";
ly_c_init_guile ();
call_constructors ();
- init_global_tweak_registry ();
init_fontconfig ();
init_freetype ();
ly_reset_all_fonts ();
- if (!init_scheme_variables.empty ()
- || !init_scheme_code_string.empty ())
- {
- init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list "
- + init_scheme_variables + "))";
-
- init_scheme_code_string
- = "(begin #t "
- + init_scheme_variables
- + init_scheme_code_string
- + ")";
-
- char const *str0 = init_scheme_code_string.c_str ();
-
- if (be_verbose_global)
- progress_indication (_f ("Evaluating %s", str0));
- scm_c_eval_string ((char *) str0);
- }
/* We accept multiple independent music files on the command line to
reduce compile time when processing lots of small files.
SCM *tail = &files;
while (char const *arg = option_parser->get_next_arg ())
{
- *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
+ *tail = scm_cons (scm_from_locale_string (arg), SCM_EOL);
tail = SCM_CDRLOC (*tail);
}
if (eq != NPOS)
{
key = arg.substr (0, eq);
- val = arg.substr (eq + 1, key.length () - 1);
+ val = arg.substr (eq + 1, arg.length () - 1);
}
- init_scheme_variables
+ init_scheme_variables_global
+= "(cons \'" + key + " " + val + ")\n";
}
break;
case 'j':
jail_spec = option_parser->optional_argument_str0_;
break;
+
case 'e':
- init_scheme_code_string += option_parser->optional_argument_str0_;
+ init_scheme_code_global += option_parser->optional_argument_str0_ + string (" ");
break;
case 'w':
warranty ();
break;
case 'V':
be_verbose_global = true;
- break;
- case 's':
- be_safe_global = true;
- init_scheme_variables
- += "(cons \'safe #t)\n";
-
break;
case 'p':
make_preview = true;
projects / lilypond.git / blobdiff