X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=58d7553430158f16145b5c44df83acce45ea5fb0;hb=ff3d20fcb28e7ccf0fa9ad242dc16afb9cf0f7ba;hp=868dbbd07718e04cc20513ba4bfefab1986bed6b;hpb=aaf7cd07dd2904f4c9278fba174c523a93041998;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 868dbbd077..58d7553430 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,13 +3,14 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ #include -#include +#include #include #include +#include #include "config.h" @@ -25,14 +26,15 @@ #include "string.hh" #include "main.hh" #include "file-path.hh" -#include "file-results.hh" -#include "debug.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" +static int sane_putenv (char const* key, char const* value, bool overwrite = false); /* Global options that can be overridden through command line. @@ -50,15 +52,9 @@ Array dump_header_fieldnames_global; /* Name of initialisation file. */ String init_name_global; -/* Write midi as formatted ascii stream? */ -bool midi_debug_global_b; - /* Do not calculate and write paper output? */ bool no_paper_global_b = false; -/* Do not write timestamps in output? */ -bool no_timestamps_global_b = false; - /* Selected output format. One of tex, ps, scm, as. */ String output_format_global = "tex"; @@ -72,6 +68,8 @@ bool safe_global_b = false; /* Verbose progress indication? */ bool verbose_global_b = false; +/* Scheme code to execute before parsing, after .scm init */ +String init_scheme_code_string = "(begin #t "; /* @@ -79,7 +77,7 @@ bool verbose_global_b = false; */ -All_font_metrics *all_fonts_global_p; +All_font_metrics *all_fonts_global; int exit_status_global; File_path global_path; @@ -105,105 +103,103 @@ static Getopt_long *oparser_p_static = 0; follow regular localisation guidelines). */ static Long_option_init options_static[] = { - {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, - {0, "help", 'h', _i ("this help")}, + {_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")}, - {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, {0, "no-paper", 'm', _i ("produce MIDI output only")}, - {_i ("NAME"), "output", 'o', _i ("write output to NAME")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, + {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, +#if 0 + /* + should audit again. + */ {0, "safe", 's', _i ("inhibit file output naming and exporting")}, - {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, +#endif {0, "version", 'v', _i ("print version number")}, - {0, "verbose", 'V', _i("verbose")}, + {0, "verbose", 'V', _i ("be verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0, "midi-debug", 'X', _i ("write midi ouput in formatted ascii")}, {0,0,0,0} }; void -identify (ostream* os) +identify (FILE *out) +{ + fputs (gnu_lilypond_version_string ().to_str0 (), out); +} + +void +dirinfo (FILE *out) { - *os << gnu_lilypond_version_str (); + 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 : "")); } void usage () { - - /* - No version number or newline here. It confuses help2man - */ - cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond"); - cout << "\n\n"; - cout << _ ("Typeset music and or play MIDI from FILE"); - cout << "\n\n"; - cout << -_( -"LilyPond is a music typesetter. It produces beautiful sheet music\n" -"using a high level description file as input. LilyPond is part of \n" -"the GNU Project.\n" -); - - cout << '\n'; - cout << _ ("Options:"); - cout << '\n'; - cout << Long_option_init::table_str (options_static); - cout << '\n'; - cout << _ ("This binary was compiled with the following options:") - << " " << -#ifdef NDEBUG - "NDEBUG " -#endif -#ifdef NPRINT - "NPRINT " -#endif -#ifdef STRING_UTILS_INLINED - "STRING_UTILS_INLINED " -#endif - "\n" - "datadir: `" DIR_DATADIR "'\n" - "localedir: `" DIR_LOCALEDIR "'\n" - "\n"; - - - cout << endl; - - cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; + printf ("\n"); + /* No version number or newline here. It confuses help2man. */ + printf (_f ("Usage: %s [OPTIONS]... FILE...", "lilypond").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 ("\n"); + printf (_ ("Options:").to_str0 ()); + printf ("\n"); + printf (Long_option_init::table_string (options_static).to_str0 ()); + printf ("\n"); + printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ()); + printf ("\n"); + printf ("\n"); } void version () { - identify (&cout); - cout << '\n'; - cout << _f ("" + 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"); - cout << endl; + "lilypond").to_str0 ()); + printf ("\n"); - cout << _f ("Copyright (c) %s by", "1996--2001"); - cout << '\n'; - cout << " Han-Wen Nienhuys \n"; - cout << " Jan Nieuwenhuizen \n"; + printf (_f ("Copyright (c) %s by", "1996--2003").to_str0 ()); + printf ("\n"); + printf (" Han-Wen Nienhuys \n"); + printf (" Jan Nieuwenhuizen \n"); } void notice () { - cout << '\n'; - cout << _ ("GNU LilyPond -- The music typesetter"); - cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--2001"); - cout << '\n'; - cout << " Han-Wen Nienhuys \n"; - cout << " Jan Nieuwenhuizen \n"; - cout << '\n'; - cout << _ ( + 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"); + 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" @@ -215,68 +211,56 @@ notice () "\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., 675 Mass Ave, Cambridge, MA 02139,\n" - "USA.\n"); + "the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,\n" + "USA.\n").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 setup_paths () { - // facilitate binary distributions - char const *env_lily = getenv ("LILYPONDPREFIX"); - String prefix_directory; - if (env_lily) - prefix_directory = env_lily; + if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) + prefix_directory[1] = lilypond_prefix; #if HAVE_GETTEXT - setlocale (LC_ALL, ""); /* enable locales */ - setlocale (LC_NUMERIC, "C"); /* musn't have comma's in TeX output... */ + /* 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 (); - - /* - urg; what *do* we want with $LILYPONDPREFIX, DIR_DATADIR and $prefix/share - handy for multiple source-dir runs, though... - */ - if (!prefix_directory.empty_b()) - { - lily_locale_dir = prefix_directory + "/share/locale"; - bindtextdomain (name.ch_C (), lily_locale_dir.ch_C()); - } - else - bindtextdomain (name.ch_C (), DIR_LOCALEDIR); - textdomain (name.ch_C ()); + bindtextdomain (name.to_str0 (), LOCALEDIR); + textdomain (name.to_str0 ()); #endif global_path.add (""); - // must override (come before) "/usr/local/share/lilypond"! - char const *env_sz = getenv ("LILYINCLUDE"); - if (env_sz) - global_path.parse_path (env_sz); - /* - Should use kpathsea, this is getting out of hand. - */ - char *suffixes[] = {"ly", "afm", "scm", "tfm", "ps", 0}; - String prefix = prefix_directory; - if (prefix.empty_b ()) - prefix = DIR_DATADIR; - for (char **s = suffixes; *s; s++) - { - String p = prefix + to_str ('/') + String (*s); - global_path.add (p); + /* Adding mf/out make lilypond unchanged source directory, when setting + LILYPONDPREFIX to lilypond-x.y.z */ + char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0}; + for (unsigned i = 0; prefix_directory[i]; i++) + for (char **s = suffixes; *s; s++) + { + String p = prefix_directory[i] + to_string ('/') + String (*s); + global_path.prepend (p); + #if !KPATHSEA - /* Urg: GNU make's $(word) index starts at 1 */ - int i = 1; - while (global_path.try_add (p + to_str (".") + to_str (i))) - i++; + /* Urg: GNU make's $ (word) index starts at 1 */ + int i = 1; + while (global_path.try_add (p + to_string (".") + to_string (i))) + i++; #endif - } -} - + } + } + /** Make input file name from command argument. @@ -287,127 +271,146 @@ Path distill_inname (String str) { Path p = split_path (str); - if (str.empty_b () || str == "-") + if (str.is_empty () || str == "-") p.base = "-"; else { String orig_ext = p.ext; - char const *extensions[] = {"ly", "fly", "sly", "", 0}; + char const *extensions[] = {"ly", "", 0}; for (int i = 0; extensions[i]; i++) { p.ext = orig_ext; - if (*extensions[i] && !p.ext.empty_b ()) + if (*extensions[i] && !p.ext.is_empty ()) p.ext += "."; p.ext += extensions[i]; - if (!global_path.find (p.str ()).empty_b ()) + if (!global_path.find (p.to_string ()).is_empty ()) break; } /* Reshuffle extension */ - p = split_path (p.str ()); + p = split_path (p.to_string ()); } return p; } -String -format_to_ext (String format) +void +prepend_load_path (String dir) { - if (format == "tex") - /* .lytex change put off */ - return "tex"; // "lytex"; - return format; + String s = "(set! %load-path (cons \"" + + dir + + "\" %load-path))"; + scm_c_eval_string (s.to_str0 ()); } void -main_prog (int, char**) +main_prog (void *, int, char **) { - /* - need to do this first. Engravers use lily.scm contents. - */ - init_lily_guile (); - if (verbose_global_b) - progress_indication ("\n"); - read_lily_scm_file ("lily.scm"); - cout << endl; + /* 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 (); - all_fonts_global_p = new All_font_metrics (global_path.str ()); + 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 ; - while ((arg = oparser_p_static->get_next_arg ()) || p == 0) + const char *arg = oparser_p_static->get_next_arg (); + + /* Only exit until after running init_scheme_code, for + (ly-option-usage) or + -e "(ly-set-option 'help #t)" */ + if (!arg) { - String infile; - - if (arg) - infile = arg; - else - infile = "-"; - - // What/when was this supposed to do? - // It looks like it reset the outname_str_global for every new - // file, but only if user didn't specify a outname? Huh? - // if (outname_str_global == "") - { - Midi_def::reset_score_count (); - Paper_def::reset_score_count (); - } + usage (); + /* No FILE arguments is now a usage error */ + exit (2); + } + 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.str () != "-") - outpath.ext = format_to_ext (output_format_global); + 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.empty_b ()) + if (!output_name_global.is_empty ()) outpath = split_path (output_name_global); String init; - if (!init_name_global.empty_b ()) + if (!init_name_global.is_empty ()) init = init_name_global; - else if (!inpath.ext.empty_b ()) - init = "init." + inpath.ext; else init = "init.ly"; - /* Burp: output name communication goes through _global */ - String save_output_name_global = output_name_global; - output_name_global = outpath.str (); - do_one_file (init, inpath.str ()); - output_name_global = save_output_name_global; + 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; exit (exit_status_global); } +static int +sane_putenv (char const* key, char const* value, bool overwrite) +{ + if (overwrite || !getenv (key)) + { + String combine = String (key) + "=" + String (value); + char * s = strdup(combine.to_str0 ()); + return putenv (s); + } + return -1; +} + int main (int argc, char **argv) { - debug_init (); // should be first (can see that; but Why?) setup_paths (); /* - prepare guile for heavy mem usage. - - putenv is POSIX, setenv is BSD 4.3 - */ - putenv ("GUILE_INIT_SEGMENT_SIZE_1=4194304"); - putenv ("GUILE_MAX_SEGMENT_SIZE=8388608"); - - ly_init_kpath (argv[0]); - - oparser_p_static = new Getopt_long(argc, argv, options_static); - while (Long_option_init const * opt = (*oparser_p_static)()) + + 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); + + init_kpath (argv[0]); + + bool help_b = false; + oparser_p_static = new Getopt_long (argc, argv, options_static); + while (Long_option_init const * opt = (*oparser_p_static) ()) { - switch (opt->shortname_ch_) + switch (opt->shortname_char_) { case 'v': version (); @@ -415,35 +418,48 @@ main (int argc, char **argv) break; case 'o': { - String s = oparser_p_static->optional_argument_ch_C_; + String s = oparser_p_static->optional_argument_str0_; Path p = split_path (s); - if (p.ext.empty_b ()) - p.ext = format_to_ext (output_format_global); - output_name_global = p.str (); + if (s != "-" && p.ext.is_empty ()) + p.ext = output_format_global; + + output_name_global = p.to_string (); } break; + case 'e': + init_scheme_code_string += + oparser_p_static->optional_argument_str0_; + break; case 'w': notice (); exit (0); break; case 'f': - output_format_global = oparser_p_static->optional_argument_ch_C_; + if (oparser_p_static->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. + + exit (0); + } + output_format_global = oparser_p_static->optional_argument_str0_; break; case 'P': - dependency_prefix_global = oparser_p_static->optional_argument_ch_C_; + dependency_prefix_global = oparser_p_static->optional_argument_str0_; break; case 'H': - dump_header_fieldnames_global.push (oparser_p_static->optional_argument_ch_C_); + dump_header_fieldnames_global.push (oparser_p_static->optional_argument_str0_); break; case 'I': - global_path.push (oparser_p_static->optional_argument_ch_C_); + global_path.push (oparser_p_static->optional_argument_str0_); break; case 'i': - init_name_global = oparser_p_static->optional_argument_ch_C_; + init_name_global = oparser_p_static->optional_argument_str0_; break; case 'h': - usage (); - exit (0); + help_b = true; break; case 'V': verbose_global_b = true; @@ -457,26 +473,21 @@ main (int argc, char **argv) case 'm': no_paper_global_b = true; break; - case 'T': - no_timestamps_global_b = true; - break; - case 'X': - midi_debug_global_b = true; - break; default: assert (false); break; } } - identify (&cerr); -#ifdef WINNT - gh_enter (argc, argv, main_prog); -#else - gh_enter (argc, argv, (void(*)(int, char**))main_prog); -#endif + if (help_b) + { + usage (); + if (verbose_global_b) + dirinfo (stdout); + exit (0); + } + + scm_boot_guile (argc, argv, (void (*) (void*, int, char**))main_prog, 0); return 0; // unreachable } - -