X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=e171dfff822f7aebbe11e757745c4b44ca7fd60e;hb=9458fa215af0294e9c38d62cc3a237a85fe50509;hp=754b5c4dec1c912e4b5ffaa6a47506de04d85e80;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 754b5c4dec..e171dfff82 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -1,5 +1,5 @@ /* - main.cc -- implement main: entrypoints + main.cc -- implement main () entrypoint. source file of the GNU LilyPond music typesetter @@ -12,41 +12,29 @@ #include #include -#include "config.h" +#include "config.hh" #if HAVE_GETTEXT #include #endif -#include "lily-guile.hh" -#include "lily-version.hh" #include "all-font-metrics.hh" +#include "file-name.hh" +#include "file-path.hh" #include "getopt-long.hh" +#include "global-ctor.hh" +#include "kpath.hh" +#include "lily-guile.hh" +#include "lily-version.hh" +#include "main.hh" #include "misc.hh" +#include "output-def.hh" #include "string.hh" -#include "main.hh" -#include "file-path.hh" -#include "input-file-results.hh" #include "warn.hh" -#include "lily-guile.hh" -#include "paper-def.hh" -#include "midi-def.hh" -#include "global-ctor.hh" -#include "kpath.hh" - -Array failed_files; - -static int sane_putenv (char const* key, char const* value, bool overwrite = false); /* - Global options that can be overridden through command line. -*/ - -/* Write dependencies file? */ -bool dependency_global_b = false; - -/* Prepend to dependencies */ -String dependency_prefix_global; + * 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; @@ -70,94 +58,134 @@ bool safe_global_b = false; /* Verbose progress indication? */ bool verbose_global_b = false; -/* Scheme code to execute before parsing, after .scm init */ +/* Scheme code to execute before parsing, after .scm init + This is where -e arguments are appended to. +*/ String init_scheme_code_string = "(begin #t "; + /* - Misc. global stuff. + * Miscellaneous global stuff. */ - - -All_font_metrics *all_fonts_global; -int exit_status_global; File_path global_path; -/* Number of current score output block. If there's more than one - score block, this counter will be added to the output filename. */ -int score_count_global; - - /* - File globals. + * File globals. */ +static char const *AUTHORS = +" Han-Wen Nienhuys \n" +" Jan Nieuwenhuizen \n"; + +static char const *PROGRAM_NAME = "lilypond-bin"; +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 `lilypond-bin --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 (refer to the file COPYING) 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 + LOCAL_LILYPOND_DATADIR = /usr/share/lilypond/ */ +char const *prefix_directory[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; + /* The option parser */ -static Getopt_long *oparser_p_static = 0; +static Getopt_long *option_parser = 0; -/* - Internationalisation kludge in two steps: +/* Internationalisation kludge in two steps: * use _i () to get entry in POT file - * call gettext () explicitely for actual "translation" + * call gettext () explicitely for actual "translation" */ + +static Long_option_init options_static[] = + { + {_i ("EXPR"), "evaluate", 'e', + _i ("set options, use -e '(ly-option-usage)' for help")}, + /* Bug in option parser: --output=foe is taken as an abbreviation + for --output-format. */ + {_i ("EXT"), "format", 'f', _i ("use output format EXT")}, + {0, "help", 'h', _i ("print this help")}, + {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, + {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, + {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, + {0, "no-paper", 'm', _i ("produce MIDI output only")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, + {0, "safe-mode", 's', _i ("run in safe mode")}, + {0, "version", 'v', _i ("print version number")}, + {0, "verbose", 'V', _i ("be verbose")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0,0,0,0} + }; + +static void +dir_info (FILE *out) +{ + fputs ("\n", out); + fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); + fprintf (out, "LOCAL_LILYPOND_DATADIR=\%s\"\n", LOCAL_LILYPOND_DATADIR); + fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); - Note: these messages all start with lower case (ie, don't - follow regular localisation guidelines). - */ -static Long_option_init options_static[] = { - {_i ("EXPR"), "evaluate", 'e', - _i ("set options, use -e '(ly-option-usage)' for help")}, - /* another bug in option parser: --output=foe is taken as an abbreviation - for --output-format */ - {_i ("EXT"), "format", 'f', _i ("use output format EXT")}, - {0, "help", 'h', _i ("print this help")}, - {_i ("FIELD"), "header", 'H', _i ("write header field to BASENAME.FIELD")}, - {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, - {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, - {0, "dependencies", 'M', _i ("write Makefile dependencies for every input file")}, - {0, "no-paper", 'm', _i ("produce MIDI output only")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, - {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, - {0, "safe-mode", 's', _i ("run in safe mode")}, - {0, "version", 'v', _i ("print version number")}, - {0, "verbose", 'V', _i ("be verbose")}, - {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0,0} -}; - -void + char *lilypond_prefix = getenv ("LILYPONDPREFIX"); + fprintf (out, "LILYPONDPREFIX=\"%s\"\n", + (lilypond_prefix ? lilypond_prefix : "")); +} + +static void +copyright () +{ + printf (_f ("Copyright (c) %s by\n%s and others.", + "1996--2004", + AUTHORS).to_str0 ()); + printf ("\n"); +} + +static void identify (FILE *out) { fputs (gnu_lilypond_version_string ().to_str0 (), out); } -void -dirinfo (FILE *out) +static void +notice () { - fputs ("\n", out); - fprintf (out, "lilypond_datadir: `%s'\n", LILYPOND_DATADIR); - fprintf (out, "local_lilypond_datadir: `%s'\n", LOCAL_LILYPOND_DATADIR); - fprintf (out, "localedir: `%s'\n", LOCALEDIR); - - char *lilypond_prefix = getenv ("LILYPONDPREFIX"); - fprintf (out, "LILYPONDPREFIX: `%s'\n", - (lilypond_prefix ? lilypond_prefix : "")); + identify (stdout); + printf ("\n"); + printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); + printf ("\n"); + copyright (); } -void +static void usage () { - printf ("\n"); - /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTIONS]... FILE...", "lilypond").to_str0 ()); + /* No version number or newline here. It confuses help2man. */ + printf (_f ("Usage: %s [OPTIONS]... FILE...", PROGRAM_NAME).to_str0 ()); printf ("\n\n"); printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); printf ("\n\n"); - printf(_ ("LilyPond produces beautiful music notation.\n" - "For more information, see http://lilypond.org/" -).to_str0 ()); - + printf (_ ("LilyPond produces beautiful music notation.").to_str0 ()); printf ("\n"); + printf (_f ("For more information, see %s", PROGRAM_URL).to_str0 ()); + printf ("\n\n"); printf (_ ("Options:").to_str0 ()); printf ("\n"); printf (Long_option_init::table_string (options_static).to_str0 ()); @@ -167,77 +195,23 @@ usage () printf ("\n"); } -void -version () +static void +warranty () { identify (stdout); printf ("\n"); - printf (_f ( - "This is free software. It is covered by the GNU General Public License,\n" - "and you are welcome to change it and/or distribute copies of it under\n" - "certain conditions. Invoke as `%s --warranty' for more information.\n", - "lilypond").to_str0 ()); - printf ("\n"); - - printf (_f ("Copyright (c) %s by", "1996--2003").to_str0 ()); - printf ("\n"); - printf (" Han-Wen Nienhuys \n"); - printf (" Jan Nieuwenhuizen \n"); -} - -void -notice () -{ - printf ("\n"); - printf (_ ("GNU LilyPond -- The music typesetter").to_str0 ()); - printf ("\n"); - printf (_f ("Copyright (c) %s by", "1996--2003").to_str0 ()); - printf ("\n"); - printf (" Han-Wen Nienhuys \n"); - printf (" Jan Nieuwenhuizen \n"); + copyright (); printf ("\n"); - printf ( _ ( - " 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 (refer to the file COPYING) 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, Boston, MA 02111-1307,\n" - "USA.\n").to_str0 ()); + printf (_ (WARRANTY).to_str0 ()); } - -/* Where LilyPond's init files live. Typically: - LILYPOND_DATADIR = /usr/local/share/lilypond - LOCAL_LILYPOND_DATADIR = /usr/local/share/lilypond/1.5.68 */ -char const *prefix_directory[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; - -void +static void setup_paths () { if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) prefix_directory[1] = lilypond_prefix; -#if HAVE_GETTEXT - /* Enable locales */ - setlocale (LC_ALL, ""); - /* Mustn't have commas in TeX output... */ - setlocale (LC_NUMERIC, "C"); - String lily_locale_dir; - String name (PACKAGE); - name.to_lower (); - bindtextdomain (name.to_str0 (), LOCALEDIR); - textdomain (name.to_str0 ()); -#endif - - global_path.add (""); - + global_path.append (""); /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ @@ -252,216 +226,137 @@ setup_paths () #if !KPATHSEA /* Urg: GNU make's $ (word) index starts at 1 */ int i = 1; - while (global_path.try_add (p + to_string (".") + to_string (i))) + while (global_path.try_append (p + to_string (".") + to_string (i))) i++; #endif } - } - -/** - Make input file name from command argument. - - Path describes file name with added default extension, - ".ly" if none. "-" is stdin. - */ -Path -distill_inname (String str) -{ - Path p = split_path (str); - if (str.is_empty () || str == "-") - p.base = "-"; - else - { - String orig_ext = p.ext; - char const *extensions[] = {"ly", "", 0}; - for (int i = 0; extensions[i]; i++) - { - p.ext = orig_ext; - if (*extensions[i] && !p.ext.is_empty ()) - p.ext += "."; - p.ext += extensions[i]; - if (!global_path.find (p.to_string ()).is_empty ()) - break; - } - /* Reshuffle extension */ - p = split_path (p.to_string ()); - } - return p; } - -void + +static void prepend_load_path (String dir) { - String s = "(set! %load-path (cons \"" - + dir - + "\" %load-path))"; + String s = "(set! %load-path (cons \"" + dir + "\" %load-path))"; scm_c_eval_string (s.to_str0 ()); } -void -main_prog (void *, int, char **) +static void +main_with_guile (void *, int, char **) { /* Engravers use lily.scm contents, need to make Guile find it. Prepend onto GUILE %load-path, very ugh. */ - for (unsigned i = 0; prefix_directory[i]; i++) { prepend_load_path (prefix_directory[i]); - /* Junk this. We should make real modules iso. just loading files. */ prepend_load_path (String (prefix_directory[i]) + "/scm"); } if (verbose_global_b) - dirinfo (stderr); - - ly_init_guile (); - call_constructors (); + dir_info (stderr); + ly_c_init_guile (); + call_constructors (); progress_indication ("\n"); all_fonts_global = new All_font_metrics (global_path.to_string ()); init_scheme_code_string += ")"; - gh_eval_str ((char *)init_scheme_code_string.to_str0 ()); - - int p=0; - const char *arg = oparser_p_static->get_next_arg (); + scm_c_eval_string ((char*) init_scheme_code_string.to_str0 ()); - /* Only exit until after running init_scheme_code, for - (ly-option-usage) or - -e "(ly-set-option 'help #t)" */ - if (!arg) - { - usage (); - /* No FILE arguments is now a usage error */ - exit (2); - } + /* 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. */ - do - { - String infile (arg); - Path inpath = distill_inname (infile); - - /* By default, use base name of input file for output file name */ - Path outpath = inpath; - if (inpath.to_string () != "-") - outpath.ext = output_format_global; - - /* By default, write output to cwd; do not copy directory part - of input file name */ - outpath.root = ""; - outpath.dir = ""; - - if (!output_name_global.is_empty ()) - outpath = split_path (output_name_global); - - String init; - if (!init_name_global.is_empty ()) - init = init_name_global; - else - init = "init.ly"; - - do_one_file (init, inpath.to_string (), outpath.to_string ()); - - p++; - } while ((arg = oparser_p_static->get_next_arg ())); - delete oparser_p_static; - oparser_p_static = 0; - - if (exit_status_global) + SCM files = SCM_EOL; + SCM *tail = &files; + while (char const *arg = option_parser->get_next_arg ()) { - printf ("Failed files: "); - for (int i = 0; i < failed_files.size (); i++) - printf ("%s ", failed_files[i].to_str0 ()); - printf ("\n"); + *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); + tail = SCM_CDRLOC (*tail); } - exit (exit_status_global); -} + delete option_parser; + option_parser = 0; - -static int -sane_putenv (char const* key, char const* value, bool overwrite) -{ - if (overwrite || !getenv (key)) + if (files == SCM_EOL) { - String combine = String (key) + "=" + String (value); - char * s = strdup(combine.to_str0 ()); - return putenv (s); + /* No FILE arguments is now a usage error to help newbies. If you + want a filter, you're not a newbie and should know to use file + argument `-'. */ + usage (); + exit (2); } - return -1; -} -int -main (int argc, char **argv) -{ - setup_paths (); + SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files); + (void) result; - /* - - These settings hopefully prepare lily for a lot of memory usage. - In practice the effect on GC times is barely measurable -- larger - segments cost slighly less time for the conservative marking. (but - not impressively much) - - */ - sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304", false); - sane_putenv ("GUILE_MAX_SEGMENT_SIZE", "8388608", false); + /* Unreachable. */ + exit (0); +} - init_kpath (argv[0]); +static void +setup_localisation () +{ +#if HAVE_GETTEXT + /* Enable locales */ + setlocale (LC_ALL, ""); + + /* FIXME: check if this is still true. + Disable localisation of float values. This breaks TeX output. */ + setlocale (LC_NUMERIC, "C"); + + String name (PACKAGE); + name.to_lower (); + bindtextdomain (name.to_str0 (), LOCALEDIR); + textdomain (name.to_str0 ()); +#endif +} +static void +parse_argv (int argc, char **argv) +{ bool help_b = false; - oparser_p_static = new Getopt_long (argc, argv, options_static); - while (Long_option_init const * opt = (*oparser_p_static) ()) + option_parser = new Getopt_long (argc, argv, options_static); + while (Long_option_init const *opt = (*option_parser) ()) { switch (opt->shortname_char_) { case 'v': - version (); - exit (0); // we print a version anyway. + notice (); + exit (0); break; case 'o': { - String s = oparser_p_static->optional_argument_str0_; - Path p = split_path (s); - if (s != "-" && p.ext.is_empty ()) - p.ext = output_format_global; - - output_name_global = p.to_string (); + String s = option_parser->optional_argument_str0_; + File_name file_name (s); + output_name_global = file_name.to_string (); } break; case 'e': - init_scheme_code_string += - oparser_p_static->optional_argument_str0_; + init_scheme_code_string += option_parser->optional_argument_str0_; break; case 'w': - notice (); + warranty (); exit (0); break; case 'f': - if (oparser_p_static->optional_argument_str0_ == "help") + if (option_parser->optional_argument_str0_ == "help") { - printf("This option is for developers only; Read the source code for more information\n"); - - // actually it's not here, - // but we award you special points for looking here. - + printf (_ ("This option is for developers only.").to_str0 ()); + printf (_ ("Read the sources for more information.").to_str0 ()); exit (0); } - output_format_global = oparser_p_static->optional_argument_str0_; - break; - case 'P': - dependency_prefix_global = oparser_p_static->optional_argument_str0_; + output_format_global = option_parser->optional_argument_str0_; break; case 'H': - dump_header_fieldnames_global.push (oparser_p_static->optional_argument_str0_); + dump_header_fieldnames_global + .push (option_parser->optional_argument_str0_); break; case 'I': - global_path.push (oparser_p_static->optional_argument_str0_); + global_path.append (option_parser->optional_argument_str0_); break; case 'i': - init_name_global = oparser_p_static->optional_argument_str0_; + init_name_global = option_parser->optional_argument_str0_; break; case 'h': help_b = true; @@ -472,9 +367,6 @@ main (int argc, char **argv) case 's': safe_global_b = true; break; - case 'M': - dependency_global_b = true; - break; case 'm': no_paper_global_b = true; break; @@ -488,11 +380,21 @@ main (int argc, char **argv) { usage (); if (verbose_global_b) - dirinfo (stdout); + dir_info (stdout); exit (0); } +} + +int +main (int argc, char **argv) +{ + setup_localisation (); + setup_paths (); + parse_argv (argc, argv); + initialize_kpathsea (argv[0]); - scm_boot_guile (argc, argv, (void (*) (void*, int, char**))main_prog, 0); + scm_boot_guile (argc, argv, main_with_guile, 0); - return 0; // unreachable + /* Unreachable */ + return 0; }