X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=7a524d77dc8b45295c838e9079195252a7dc123d;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=f640801b84a647ecffec6878d371c6b4a3706915;hpb=4a28eb71bfc9974f5cf1340c466cb41fd92196bb;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index f640801b84..7a524d77dc 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2006 Han-Wen Nienhuys + (c) 1997--2007 Han-Wen Nienhuys */ #include "main.hh" @@ -34,7 +34,6 @@ using namespace std; #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" @@ -78,8 +77,8 @@ bool be_verbose_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_global; +string init_scheme_variables_global; /* Generate preview of first system. */ bool make_preview = false; @@ -89,7 +88,7 @@ bool make_print = true; bool relocate_binary = -#if ARGV0_RELOCATION +#if 1 true; #else false @@ -129,7 +128,7 @@ static char const *WARRANTY "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n" "General Public License for more details.\n" "\n" - " You should have received a copy (refer to the file COPYING) of the\n" + " You should have received a copy of the\n" "GNU General Public License along with this program; if not, write to\n" "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" "Boston, MA 02111-1307, USA.\n"); @@ -151,24 +150,24 @@ static Getopt_long *option_parser = 0; 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 @@ -178,8 +177,8 @@ static Long_option_init options_static[] {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} @@ -221,7 +220,7 @@ static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2006", + "1996--2007", AUTHORS).c_str ()); printf ("\n"); } @@ -321,7 +320,7 @@ do_chroot_jail () 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); @@ -338,7 +337,7 @@ do_chroot_jail () 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); @@ -346,26 +345,26 @@ do_chroot_jail () 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); } @@ -387,34 +386,16 @@ main_with_guile (void *, int, char **) || 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 (); - all_fonts_global = new All_font_metrics (global_path.to_string ()); - - 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. @@ -424,9 +405,10 @@ main_with_guile (void *, int, char **) 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); } + delete option_parser; option_parser = 0; @@ -505,10 +487,10 @@ parse_argv (int argc, char **argv) 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; @@ -527,8 +509,9 @@ parse_argv (int argc, char **argv) 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 (); @@ -540,7 +523,12 @@ parse_argv (int argc, char **argv) break; case 'f': - output_format_global = option_parser->optional_argument_str0_; + { + vector components + = string_split (option_parser->optional_argument_str0_, ','); + for (vsize i = 0; i < components.size (); i++) + add_output_format (components[i]); + } break; case 'H': @@ -558,12 +546,6 @@ parse_argv (int argc, char **argv) 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; @@ -596,13 +578,19 @@ setup_guile_env () bool overwrite = true; if (!yield) { - yield = "70"; + yield = "65"; overwrite = false; } sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite); sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite); sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite); + + + sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", + "10485760", overwrite); + sane_putenv ("GUILE_MAX_SEGMENT_SIZE", + "104857600", overwrite); } void @@ -622,6 +610,7 @@ main (int argc, char **argv) setup_paths (argv[0]); setup_guile_env (); +#if 0 /* Debugging aid. */ try { @@ -631,7 +620,32 @@ main (int argc, char **argv) { error (_f ("exception caught: %s", e.what ())); }; - +#else + scm_boot_guile (argc, argv, main_with_guile, 0); +#endif + /* Only reachable if GUILE exits. That is an error. */ return 1; } + +SCM atexit_list = SCM_EOL; + +LY_DEFINE (ly_atexit, "ly:atexit", + 2, 0, 0, (SCM proc, SCM args), + "Just before exiting, call the procedure given. " +"If this is called multiple times, the procedures are called " +"in LIFO order.") +{ + atexit_list = scm_cons (scm_cons (proc, args), atexit_list); + scm_gc_protect_object (atexit_list); + return SCM_UNSPECIFIED; +} + +LY_DEFINE (ly_do_atexit, "ly:do-atexit", + 0, 0, 0, (), + "Call the atexit procedures.") +{ + for (SCM s = atexit_list; scm_is_pair (s); s = scm_cdr (s)) + scm_apply_0 (scm_caar (s), scm_cdar (s)); + return SCM_UNSPECIFIED; +}