X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=ea5a29c7bc65e999aaf1f4601d4bccc10b4e7bea;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9fa362c6c233c1db93791c9a4f6d2ab7189689cb;hpb=75eebcb49e52d296b1da3e1074e0825d2c780db4;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 9fa362c6c2..ba8c3acbbc 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--2008 Han-Wen Nienhuys */ #include "main.hh" @@ -33,37 +33,35 @@ using namespace std; #include "freetype.hh" #include "getopt-long.hh" #include "global-ctor.hh" -#include "lily-guile.hh" +#include "international.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 dump_header_fieldnames_global; +vector 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"; /* 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; @@ -76,23 +74,10 @@ 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; - -/* Generate preview of first system. */ -bool make_preview = false; +string init_scheme_code_global; +string init_scheme_variables_global; -/* Generate printed output. */ -bool make_print = true; - - -bool relocate_binary = -#if ARGV0_RELOCATION - true; -#else - false -#endif - ; +bool relocate_binary = true; /* @@ -127,7 +112,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"); @@ -135,10 +120,10 @@ static char const *WARRANTY /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond */ -String prefix_directory; +string lilypond_datadir; -/* The jail specification: USER,GROUP,JAIL,DIR. */ -String jail_spec; +/* The jail specification: USER, GROUP, JAIL, DIR. */ +string jail_spec; /* The option parser */ static Getopt_long *option_parser = 0; @@ -149,41 +134,60 @@ 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 ("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 - {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" + {_i ("USER, GROUP, JAIL, DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" "and cd into DIR")}, #endif - {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} }; -const char *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; +char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION; + + +/* x86 defaults to using 80-bit extended precision arithmetic. This can cause + problems because the truncation from 80 bits to 64 bits can occur in + unpredictable places. To get around this, we tell the x87 FPU to use only + double precision. Note that this is not needed for x86_64 because that uses + the SSE unit by default instead of the x87 FPU. */ +#if ((defined(__x86__) || defined(__i386__)) \ + && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1)) + +#include +static void configure_fpu() { + fpu_control_t fpu_control = 0x027f; + _FPU_SETCW (fpu_control); +} + +#else + +static void configure_fpu() { +} + +#endif /* defined(__x86__) || defined(__i386__) */ + static void env_var_info (FILE *out, char const *key) @@ -198,9 +202,10 @@ dir_info (FILE *out) fputs ("\n", out); fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); env_var_info (out, "LILYPONDPREFIX"); + env_var_info (out, "LILYPOND_DATADIR"); fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); - fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.to_str0 ()); + fprintf (out, "\nEffective prefix: \"%s\"\n", lilypond_datadir.c_str ()); if (relocate_binary) { @@ -210,6 +215,7 @@ dir_info (FILE *out) 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"); } } @@ -218,15 +224,15 @@ static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2006", - AUTHORS).to_str0 ()); + "1996--2008", + AUTHORS).c_str ()); printf ("\n"); } static void identify (FILE *out) { - fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs (gnu_lilypond_version_string ().c_str (), out); fputs ("\n", out); } @@ -234,9 +240,10 @@ static void notice () { identify (stdout); - puts (_f (NOTICE, PROGRAM_NAME).to_str0 ()); printf ("\n"); copyright (); + printf ("\n"); + puts (_f (NOTICE, PROGRAM_NAME).c_str ()); } LY_DEFINE (ly_usage, "ly:usage", @@ -244,21 +251,21 @@ LY_DEFINE (ly_usage, "ly:usage", "Print usage message.") { /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ()); printf ("\n\n"); - printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); + printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ()); printf ("\n\n"); - printf (_ ("LilyPond produces beautiful music notation.").to_str0 ()); + printf (_ ("LilyPond produces beautiful music notation.").c_str ()); printf ("\n"); - printf (_f ("For more information, see %s", PROGRAM_URL).to_str0 ()); + printf (_f ("For more information, see %s", PROGRAM_URL).c_str ()); printf ("\n\n"); - printf (_ ("Options:").to_str0 ()); + printf (_ ("Options:").c_str ()); printf ("\n"); - printf (Long_option_init::table_string (options_static).to_str0 ()); + printf (Long_option_init::table_string (options_static).c_str ()); printf ("\n"); printf (_f ("Report bugs via %s", "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" - ).to_str0 ()); + ).c_str ()); printf ("\n"); printf ("\n"); return SCM_UNSPECIFIED; @@ -271,14 +278,14 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).to_str0 ()); + printf (_ (WARRANTY).c_str ()); } static void -prepend_load_path (String dir) +prepend_load_path (string dir) { - String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; - scm_c_eval_string (s.to_str0 ()); + string s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; + scm_c_eval_string (s.c_str ()); } void init_global_tweak_registry (); @@ -299,11 +306,11 @@ do_chroot_jail () USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX }; - Array components = String_convert::split (jail_spec, ','); + vector 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); } @@ -311,14 +318,14 @@ do_chroot_jail () errno = 0; int uid; - if (passwd * passwd = getpwnam (components[USER_NAME].to_str0 ())) + if (passwd * passwd = getpwnam (components[USER_NAME].c_str ())) uid = passwd->pw_uid; else { 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); @@ -328,41 +335,41 @@ do_chroot_jail () errno = 0; int gid; - if (group * group = getgrnam (components[GROUP_NAME].to_str0 ())) + if (group * group = getgrnam (components[GROUP_NAME].c_str ())) gid = group->gr_gid; else { 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].to_str0 ())) + 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].to_str0 ())) + 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); } @@ -375,43 +382,26 @@ main_with_guile (void *, int, char **) /* Engravers use lily.scm contents, need to make Guile find it. Prepend onto GUILE %load-path, very ugh. */ - prepend_load_path (prefix_directory); - prepend_load_path (prefix_directory + "/scm"); + prepend_load_path (lilypond_datadir); + prepend_load_path (lilypond_datadir + "/scm"); if (be_verbose_global) dir_info (stderr); - is_TeX_format_global = (output_backend_global == "tex" - || 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.is_empty () - || !init_scheme_code_string.is_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.to_str0 (); - - if (be_verbose_global) - progress_indication (_f ("Evaluating %s", str0)); - scm_c_eval_string ((char *) str0); - } + is_TeX_format_global = (get_output_backend_name () == "tex" + || get_output_backend_name () == "texstr"); + /* We accept multiple independent music files on the command line to reduce compile time when processing lots of small files. @@ -421,14 +411,15 @@ 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; #if HAVE_CHROOT - if (!jail_spec.is_empty ()) + if (!jail_spec.empty ()) do_chroot_jail (); #endif @@ -450,17 +441,17 @@ setup_localisation () 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; - bindtextdomain ("lilypond", localedir.to_str0 ()); + bindtextdomain ("lilypond", localedir.c_str ()); textdomain ("lilypond"); #endif } static void -add_output_format (String format) +add_output_format (string format) { if (output_format_global != "") output_format_global += ","; @@ -477,36 +468,32 @@ parse_argv (int argc, char **argv) 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") - make_preview = true; - 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, arg.length () - 1); } - init_scheme_variables - += "(cons \'" + key + " " + val + ")\n"; + init_scheme_variables_global + += "(cons \'" + key + " '" + val + ")\n"; } break; @@ -516,7 +503,7 @@ parse_argv (int argc, char **argv) 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 (); } @@ -524,25 +511,27 @@ 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 (); exit (0); break; - case 'b': - output_backend_global = option_parser->optional_argument_str0_; - 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': 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_); @@ -556,12 +545,6 @@ parse_argv (int argc, char **argv) case 'V': be_verbose_global = true; break; - case 's': - be_safe_global = true; - break; - case 'p': - make_preview = true; - break; default: programming_error (to_string ("unhandled short option: %c", opt->shortname_char_)); @@ -575,7 +558,6 @@ parse_argv (int argc, char **argv) if (show_help) { - identify (stdout); ly_usage (); if (be_verbose_global) dir_info (stdout); @@ -586,22 +568,35 @@ parse_argv (int argc, char **argv) void setup_guile_env () { - char *yield = getenv ("LILYPOND_GC_YIELD"); + const char *yield = getenv ("LILYPOND_GC_YIELD"); 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); } +vector start_environment_global; + int -main (int argc, char **argv) +main (int argc, char **argv, char **envp) { + configure_fpu(); + + for (char **p = envp; *p; p++) + start_environment_global.push_back(*p); + if (getenv ("LILYPOND_VERBOSE")) be_verbose_global = true; @@ -612,8 +607,21 @@ main (int argc, char **argv) setup_paths (argv[0]); setup_guile_env (); - scm_boot_guile (argc, argv, main_with_guile, 0); +#if 0 + /* Debugging aid. */ + try + { + scm_boot_guile (argc, argv, main_with_guile, 0); + } + catch (exception e) + { + 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; }