X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=9e33ec13dcdd56139db961355b9ab6885daf4962;hb=319a81614622698d9e6aed8d6997ad0461c6614c;hp=3c0f7ae88eb7a4f28a065d1555ff4ffcf9c07aa9;hpb=95f4590b72ce219471cc4018a188b401aa3f6daa;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 3c0f7ae88e..9e33ec13dc 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--2011 Han-Wen Nienhuys - (c) 1997--2007 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 @@ -57,9 +69,6 @@ string init_name_global; /* 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; @@ -104,8 +113,9 @@ static char const *NOTICE static char const *WARRANTY = _i (" This program is free software; you can redistribute it and/or\n" - "modify it under the terms of the GNU General Public License version 2\n" - "as published by the Free Software Foundation.\n" + "modify it under the terms of the GNU General Public License as \n" + "published by the Free Software Foundation, either version 3 of\n" + "the License, or (at your option) any later version.\n" "\n" " This program is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" @@ -130,7 +140,7 @@ 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[] = { @@ -142,11 +152,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")}, @@ -166,6 +174,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) { @@ -200,9 +235,9 @@ dir_info (FILE *out) static void copyright () { - printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2007", - 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--2011", + AUTHORS).c_str ())); printf ("\n"); } @@ -217,9 +252,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", @@ -227,21 +263,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; @@ -254,7 +294,7 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).c_str ()); + printf ("%s", (_ (WARRANTY).c_str ())); } static void @@ -364,7 +404,6 @@ main_with_guile (void *, int, char **) if (be_verbose_global) dir_info (stderr); - 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 + ")"; @@ -375,10 +414,6 @@ main_with_guile (void *, int, char **) init_freetype (); ly_reset_all_fonts (); - 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. Starting the GUILE engine is very time consuming. */ @@ -390,7 +425,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; @@ -414,7 +449,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; @@ -444,11 +479,9 @@ 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_) == "relocate") relocate_binary = true; @@ -487,9 +520,10 @@ parse_argv (int argc, char **argv) case 'j': jail_spec = option_parser->optional_argument_str0_; break; - + case 'e': - init_scheme_code_global += option_parser->optional_argument_str0_ + string (" "); + init_scheme_code_global + += option_parser->optional_argument_str0_ + string (" "); break; case 'w': warranty (); @@ -534,7 +568,6 @@ parse_argv (int argc, char **argv) if (show_help) { - identify (stdout); ly_usage (); if (be_verbose_global) dir_info (stdout); @@ -545,7 +578,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) { @@ -565,13 +598,15 @@ setup_guile_env () } vector start_environment_global; - + int 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; @@ -596,7 +631,7 @@ main (int argc, char **argv, char **envp) #else scm_boot_guile (argc, argv, main_with_guile, 0); #endif - + /* Only reachable if GUILE exits. That is an error. */ return 1; }