X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=e288d361d665985d4016b3f14ecc8183a6fcd3d8;hb=a1c2a3a778efafbb8abbd44eb212a3f52f34c5f9;hp=bf8132477b290b464f6585b2e864da13f5e2c7ca;hpb=e42585017a01fd02f6353b994cf0c87b03a7bb2e;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index bf8132477b..e288d361d6 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -1,9 +1,20 @@ /* - main.cc -- implement main () entrypoint. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "main.hh" @@ -12,6 +23,7 @@ #include #include #include +#include using namespace std; #include @@ -53,16 +65,10 @@ vector dump_header_fieldnames_global; /* Name of initialisation file. */ 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 = ""; -bool is_pango_format_global; -bool is_TeX_format_global; - /* Current output name. */ string output_name_global; @@ -77,23 +83,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; +string init_scheme_code_global; +string init_scheme_variables_global; -/* Generate preview of first system. */ -bool make_preview = false; - -/* Generate printed output. */ -bool make_print = true; - - -bool relocate_binary = -#if 1 - true; -#else - false -#endif - ; +bool relocate_binary = true; /* @@ -136,9 +129,9 @@ 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. */ +/* The jail specification: USER, GROUP, JAIL, DIR. */ string jail_spec; /* The option parser */ @@ -146,40 +139,32 @@ static Getopt_long *option_parser = 0; /* Internationalisation kludge in two steps: * use _i () to get entry in POT file - * call gettext () explicitely for actual "translation" */ + * call gettext () explicitly for actual "translation" */ static Long_option_init options_static[] = { - {_i ("BACK"), "backend", 'b', _i ("use backend BACK (eps, gnome, ps [default],\nscm, svg, tex, texstr)")}, - {_i ("SYM[=VAL]"), "define-default", 'd', - _i ("set Scheme option SYM to VAL (default: #t)\n" + _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, "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 ("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, "relocate", 0, _i ("relocate using directory of lilypond program")}, - {0, "safe-mode", 's', _i ("disallow unsafe Scheme and PostScript\n" - "operations")}, {0, "version", 'v', _i ("show version number and exit")}, {0, "verbose", 'V', _i ("be verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, @@ -188,6 +173,33 @@ static Long_option_init options_static[] 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) { @@ -201,9 +213,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.c_str ()); + fprintf (out, "\nEffective prefix: \"%s\"\n", lilypond_datadir.c_str ()); if (relocate_binary) { @@ -221,9 +234,9 @@ dir_info (FILE *out) static void copyright () { - printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2006", - AUTHORS).c_str ()); + /* Do not update the copyright years here, run `make grand-replace' */ + printf ("%s", (_f ("Copyright (c) %s by\n%s and others.", "1996--2010", + AUTHORS).c_str ())); printf ("\n"); } @@ -238,9 +251,10 @@ static void notice () { identify (stdout); - puts (_f (NOTICE, PROGRAM_NAME).c_str ()); printf ("\n"); copyright (); + printf ("\n"); + puts (_f (NOTICE, PROGRAM_NAME).c_str ()); } LY_DEFINE (ly_usage, "ly:usage", @@ -248,21 +262,25 @@ 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).c_str ()); + printf ("%s", (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ())); printf ("\n\n"); - printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ()); + printf ("%s", (_ ("Typeset music and/or produce MIDI from FILE.").c_str ())); printf ("\n\n"); - printf (_ ("LilyPond produces beautiful music notation.").c_str ()); + printf ("%s", (_ ("LilyPond produces beautiful music notation.").c_str ())); printf ("\n"); - printf (_f ("For more information, see %s", PROGRAM_URL).c_str ()); + printf ("%s", (_f ("For more information, see %s", PROGRAM_URL).c_str ())); printf ("\n\n"); - printf (_ ("Options:").c_str ()); + printf ("%s", (_ ("Options:").c_str ())); printf ("\n"); - printf (Long_option_init::table_string (options_static).c_str ()); + printf ("%s", 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" - ).c_str ()); + /* Translators, please translate this string as + "Report bugs in English via %s", + or if there is a LilyPond users list or forum in your language + "Report bugs in English via %s or in YOUR_LANG via URI" */ + printf ("%s", (_f ("Report bugs via %s", + "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" + ).c_str ())); printf ("\n"); printf ("\n"); return SCM_UNSPECIFIED; @@ -275,7 +293,7 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).c_str ()); + printf ("%s", (_ (WARRANTY).c_str ())); } static void @@ -379,43 +397,22 @@ 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 (); - 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. Starting the GUILE engine is very time consuming. */ @@ -427,7 +424,7 @@ main_with_guile (void *, int, char **) *tail = scm_cons (scm_from_locale_string (arg), SCM_EOL); tail = SCM_CDRLOC (*tail); } - + delete option_parser; option_parser = 0; @@ -451,7 +448,7 @@ setup_localisation () setlocale (LC_ALL, ""); /* FIXME: check if this is still true. - Disable localisation of float values. This breaks TeX output. */ + Disable localisation of float values. */ setlocale (LC_NUMERIC, "C"); string localedir = LOCALEDIR; @@ -481,16 +478,10 @@ parse_argv (int argc, char **argv) switch (opt->shortname_char_) { case 0: - if (string (opt->longname_str0_) == "dvi" - || string (opt->longname_str0_) == "pdf" + if (string (opt->longname_str0_) == "pdf" || string (opt->longname_str0_) == "png" - || string (opt->longname_str0_) == "ps" - || string (opt->longname_str0_) == "tex") + || string (opt->longname_str0_) == "ps") 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") relocate_binary = true; break; @@ -506,11 +497,11 @@ 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 - += "(cons \'" + key + " " + val + ")\n"; + init_scheme_variables_global + += "(cons \'" + key + " '" + val + ")\n"; } break; @@ -528,18 +519,16 @@ 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': { vector components @@ -565,13 +554,6 @@ parse_argv (int argc, char **argv) case 'V': be_verbose_global = true; break; - case 's': - init_scheme_variables - += "(cons \'safe #t)\n"; - break; - case 'p': - make_preview = true; - break; default: programming_error (to_string ("unhandled short option: %c", opt->shortname_char_)); @@ -585,7 +567,6 @@ parse_argv (int argc, char **argv) if (show_help) { - identify (stdout); ly_usage (); if (be_verbose_global) dir_info (stdout); @@ -596,7 +577,7 @@ parse_argv (int argc, char **argv) void setup_guile_env () { - const char *yield = getenv ("LILYPOND_GC_YIELD"); + char const *yield = getenv ("LILYPOND_GC_YIELD"); bool overwrite = true; if (!yield) { @@ -615,12 +596,16 @@ setup_guile_env () "104857600", overwrite); } -void -read_relocation_dir (string); +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; @@ -645,7 +630,7 @@ main (int argc, char **argv) #else scm_boot_guile (argc, argv, main_with_guile, 0); #endif - + /* Only reachable if GUILE exits. That is an error. */ return 1; }