X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=1413854b1b33ce8de7ba25942259989e8c677552;hb=e04d2f37f505bd6de6ae8b3923de9b68a3a64455;hp=4232f17e2e2fc9ee0e212a28f03cffc49a18f4d5;hpb=38e0fd809d01de319d40224b5d2279888304b2d3;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 4232f17e2e..1413854b1b 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2007 Han-Wen Nienhuys + (c) 1997--2009 Han-Wen Nienhuys */ #include "main.hh" @@ -12,6 +12,7 @@ #include #include #include +#include using namespace std; #include @@ -53,16 +54,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; @@ -80,20 +75,7 @@ bool be_verbose_global = false; 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; /* @@ -146,12 +128,10 @@ 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" "Use -dhelp for help.")}, @@ -160,11 +140,9 @@ static Long_option_init options_static[] /* 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")}, @@ -174,9 +152,7 @@ static Long_option_init options_static[] {_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, "version", 'v', _i ("show version number and exit")}, {0, "verbose", 'V', _i ("be verbose")}, @@ -186,6 +162,29 @@ 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) { @@ -220,8 +219,8 @@ dir_info (FILE *out) static void copyright () { - printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2007", + /* Do not update the copyright years here, run grand-replace.sh. */ + printf (_f ("Copyright (c) %s by\n%s and others.", "1996--2009", AUTHORS).c_str ()); printf ("\n"); } @@ -237,9 +236,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", @@ -259,6 +259,10 @@ LY_DEFINE (ly_usage, "ly:usage", printf ("\n"); printf (Long_option_init::table_string (options_static).c_str ()); printf ("\n"); + /* 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 (_f ("Report bugs via %s", "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs" ).c_str ()); @@ -383,10 +387,7 @@ main_with_guile (void *, int, char **) 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 + ")"; @@ -397,7 +398,6 @@ main_with_guile (void *, int, char **) init_freetype (); ly_reset_all_fonts (); - /* 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. */ @@ -433,7 +433,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; @@ -463,16 +463,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; @@ -492,7 +486,7 @@ parse_argv (int argc, char **argv) } init_scheme_variables_global - += "(cons \'" + key + " " + val + ")\n"; + += "(cons \'" + key + " '" + val + ")\n"; } break; @@ -519,10 +513,6 @@ parse_argv (int argc, char **argv) exit (0); break; - case 'b': - output_backend_global = option_parser->optional_argument_str0_; - break; - case 'f': { vector components @@ -548,9 +538,6 @@ parse_argv (int argc, char **argv) case 'V': be_verbose_global = true; break; - case 'p': - make_preview = true; - break; default: programming_error (to_string ("unhandled short option: %c", opt->shortname_char_)); @@ -564,7 +551,6 @@ parse_argv (int argc, char **argv) if (show_help) { - identify (stdout); ly_usage (); if (be_verbose_global) dir_info (stdout); @@ -594,9 +580,16 @@ setup_guile_env () "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;