X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=239ff1b39dc245f4507e4469558b083d5067393b;hb=e79582f3ec94019a9f849b2855abab4eabae3172;hp=9ff982bcf854ad70e80205d455f4a2756818b3f7;hpb=9cf485743fe1f5f6e2de3d2c5e070b67055edeb7;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 9ff982bcf8..239ff1b39d 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--2012 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 @@ -53,25 +65,15 @@ vector dump_header_fieldnames_global; /* Name of initialisation file. */ 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; /* Run in safe mode? */ bool be_safe_global = false; -/* Provide URI links to the original file */ -bool point_and_click_global = true; - -/* Verbose progress indication? */ -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_global; @@ -79,7 +81,6 @@ string init_scheme_variables_global; bool relocate_binary = true; - /* * Miscellaneous global stuff. */ @@ -90,32 +91,33 @@ File_path global_path; */ static char const *AUTHORS -= " Han-Wen Nienhuys \n" - " Jan Nieuwenhuizen \n"; + = " Han-Wen Nienhuys \n" + " Jan Nieuwenhuizen \n"; static char const *PROGRAM_NAME = "lilypond"; static char const *PROGRAM_URL = "http://lilypond.org"; static char const *NOTICE -= _i ("This program is free software. It is covered by the GNU General Public\n" - "License and you are welcome to change it and/or distribute copies of it\n" - "under certain conditions. Invoke as `%s --warranty' for more\n" - "information.\n"); + = _i ("This program is free software. It is covered by the GNU General Public\n" + "License and you are welcome to change it and/or distribute copies of it\n" + "under certain conditions. Invoke as `%s --warranty' for more\n" + "information.\n"); 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" - "\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" - "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 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"); + = _i (" This program is free software; you can redistribute it and/or\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" + "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 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"); /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond @@ -130,42 +132,78 @@ 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 ("SYM[=VAL]"), "define-default", 'd', - _i ("set Scheme option SYM to VAL (default: #t).\n" - "Use -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, "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")}, + {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" - "and cd into DIR")}, + { + _i ("USER, GROUP, JAIL, DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n" + "and cd into DIR") + }, #endif - {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, + { + _i ("LOGLEVEL"), "loglevel", 'l', _i ("print log messages according to" + " LOGLEVEL. Possible values are:\n" + "NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG.") + }, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, {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, "silent", 's', _i ("no progress, only error messages (equivalent to loglevel=ERROR)")}, + {0, "version", 'v', _i ("show version number and exit")}, + {0, "verbose", 'V', _i ("be verbose (equivalent to loglevel=DEBUG)")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, {0, 0, 0, 0} }; 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 +238,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--2012", + AUTHORS).c_str ())); printf ("\n"); } @@ -217,31 +255,36 @@ 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", - 0, 0, 0, (), - "Print usage message.") + 0, 0, 0, (), + "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 +297,7 @@ warranty () printf ("\n"); copyright (); printf ("\n"); - printf (_ (WARRANTY).c_str ()); + printf ("%s", (_ (WARRANTY).c_str ())); } static void @@ -278,15 +321,15 @@ do_chroot_jail () actual actions. */ enum Jail - { - USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX - }; + { + USER_NAME, GROUP_NAME, JAIL, DIR, JAIL_MAX + }; vector components = string_split (jail_spec, ','); if (components.size () != JAIL_MAX) { error (_f ("expected %d arguments with jail, found: %u", JAIL_MAX, - (unsigned) components.size ())); + (unsigned) components.size ())); exit (2); } @@ -294,16 +337,16 @@ do_chroot_jail () errno = 0; int uid; - if (passwd * passwd = getpwnam (components[USER_NAME].c_str ())) + 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])); + error (_f ("no such user: %s", components[USER_NAME])); else - error (_f ("cannot get user id from user name: %s: %s", - components[USER_NAME], - strerror (errno))); + error (_f ("cannot get user id from user name: %s: %s", + components[USER_NAME], + strerror (errno))); exit (3); } @@ -311,23 +354,23 @@ do_chroot_jail () errno = 0; int gid; - if (group * group = getgrnam (components[GROUP_NAME].c_str ())) + 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])); + error (_f ("no such group: %s", components[GROUP_NAME])); else - error (_f ("cannot get group id from group name: %s: %s", - components[GROUP_NAME], - strerror (errno))); + error (_f ("cannot get group id from group name: %s: %s", + components[GROUP_NAME], + strerror (errno))); exit (3); } if (chroot (components[JAIL].c_str ())) { error (_f ("cannot chroot to: %s: %s", components[JAIL], - strerror (errno))); + strerror (errno))); exit (3); } @@ -346,7 +389,7 @@ do_chroot_jail () if (chdir (components[DIR].c_str ())) { error (_f ("cannot change working directory to: %s: %s", components[DIR], - strerror (errno))); + strerror (errno))); exit (3); } } @@ -361,10 +404,9 @@ main_with_guile (void *, int, char **) prepend_load_path (lilypond_datadir); prepend_load_path (lilypond_datadir + "/scm"); - if (be_verbose_global) + if (is_loglevel (LOG_DEBUG)) 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 +417,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 +428,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 +452,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; @@ -442,91 +480,96 @@ parse_argv (int argc, char **argv) while (Long_option_init const *opt = (*option_parser) ()) { 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") - add_output_format (opt->longname_str0_); - else if (string (opt->longname_str0_) == "relocate") - relocate_binary = true; - break; - - case 'd': - { - string arg (option_parser->optional_argument_str0_); - ssize eq = arg.find ('='); - - string key = arg; - string val = "#t"; - - if (eq != NPOS) - { - key = arg.substr (0, eq); - val = arg.substr (eq + 1, arg.length () - 1); - } - - init_scheme_variables_global - += "(cons \'" + key + " '" + val + ")\n"; - } - break; - - case 'v': - notice (); - exit (0); - break; - case 'o': - { - string s = option_parser->optional_argument_str0_; - File_name file_name (s); - output_name_global = file_name.to_string (); - } - break; - case 'j': - jail_spec = option_parser->optional_argument_str0_; - break; - - case 'e': - init_scheme_code_global += option_parser->optional_argument_str0_ + string (" "); - break; - case 'w': - warranty (); - exit (0); - break; - - case 'f': - { - 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_back (option_parser->optional_argument_str0_); - break; - case 'I': - global_path.append (option_parser->optional_argument_str0_); - break; - case 'i': - init_name_global = option_parser->optional_argument_str0_; - break; - case 'h': - show_help = true; - break; - case 'V': - be_verbose_global = true; - break; - default: - programming_error (to_string ("unhandled short option: %c", - opt->shortname_char_)); - assert (false); - break; - } + { + case 0: + if (string (opt->longname_str0_) == "pdf" + || string (opt->longname_str0_) == "png" + || string (opt->longname_str0_) == "ps") + add_output_format (opt->longname_str0_); + else if (string (opt->longname_str0_) == "relocate") + relocate_binary = true; + break; + + case 'd': + { + string arg (option_parser->optional_argument_str0_); + ssize eq = arg.find ('='); + + string key = arg; + string val = "#t"; + + if (eq != NPOS) + { + key = arg.substr (0, eq); + val = arg.substr (eq + 1, arg.length () - 1); + } + + init_scheme_variables_global + += "(cons \'" + key + " '" + val + ")\n"; + } + break; + + case 'v': + notice (); + exit (0); + break; + case 'o': + { + string s = option_parser->optional_argument_str0_; + File_name file_name (s); + output_name_global = file_name.to_string (); + } + break; + case 'j': + jail_spec = option_parser->optional_argument_str0_; + break; + + case 'e': + init_scheme_code_global + += option_parser->optional_argument_str0_ + string (" "); + break; + case 'w': + warranty (); + exit (0); + break; + + case 'f': + { + 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_back (option_parser->optional_argument_str0_); + break; + case 'I': + global_path.append (option_parser->optional_argument_str0_); + break; + case 'i': + init_name_global = option_parser->optional_argument_str0_; + break; + case 'h': + show_help = true; + break; + case 'V': + set_loglevel (LOGLEVEL_DEBUG); + break; + case 's': + set_loglevel (LOGLEVEL_ERROR); + break; + case 'l': + set_loglevel (option_parser->optional_argument_str0_); + break; + default: + programming_error (to_string ("unhandled short option: %c", + opt->shortname_char_)); + assert (false); + break; + } } if (output_format_global == "") @@ -534,10 +577,9 @@ parse_argv (int argc, char **argv) if (show_help) { - identify (stdout); ly_usage (); - if (be_verbose_global) - dir_info (stdout); + if (is_loglevel (LOG_DEBUG)) + dir_info (stdout); exit (0); } } @@ -545,7 +587,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) { @@ -557,27 +599,30 @@ setup_guile_env () 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); + "10485760", overwrite); sane_putenv ("GUILE_MAX_SEGMENT_SIZE", - "104857600", overwrite); + "104857600", overwrite); } 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); - + start_environment_global.push_back (*p); + if (getenv ("LILYPOND_VERBOSE")) - be_verbose_global = true; + set_loglevel (LOGLEVEL_DEBUG); + if (getenv ("LILYPOND_LOGLEVEL")) + set_loglevel (getenv ("LILYPOND_LOGLEVEL")); setup_localisation (); parse_argv (argc, argv); - if (isatty (STDIN_FILENO)) + if (isatty (STDIN_FILENO) && (is_loglevel (LOG_BASIC))) identify (stderr); setup_paths (argv[0]); @@ -596,29 +641,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; } - -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; -}