X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=c1d6d6e6abf35264691649f3684979d1a4dde735;hb=eae90c59e6fc5a916c6736d2ca56486b045768a5;hp=a5a222b2e50e563116abccd4708d3ae77d25be6b;hpb=3b764dbab9c6ba03a1a5c2caa0c3046e96a6f596;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index a5a222b2e5..c1d6d6e6ab 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,25 +3,24 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2000 Han-Wen Nienhuys */ #include #include #include #include + #include "lily-guile.hh" #include "lily-version.hh" -#include "all-fonts.hh" -#include "proto.hh" -#include "dimensions.hh" +#include "all-font-metrics.hh" #include "getopt-long.hh" #include "misc.hh" #include "string.hh" #include "main.hh" #include "file-path.hh" -#include "config.hh" +#include "config.h" #include "file-results.hh" #include "debug.hh" #include "lily-guile.hh" @@ -33,8 +32,13 @@ #include #endif +#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H +extern "C" { +#include +} +#endif -bool version_ignore_global_b = false; +bool verbose_global_b = false; bool no_paper_global_b = false; bool no_timestamps_global_b = false; bool find_old_relative_b = false; @@ -59,83 +63,63 @@ Getopt_long * oparser_global_p = 0; String distill_inname_str (String name_str, String& ext_r); +/* + Internationalisation kludge in two steps: + * use _i () to get entry in POT file + * call gettext () explicitely for actual "translation" + + Note: these messages all start with lower case (ie, don't + follow regular localisation guidelines). + */ Long_option_init theopts[] = { - {0, "about", 'a'}, - {1, "output", 'o'}, - {0, "warranty", 'w'}, - {0, "help", 'h'}, - {0, "test", 't'}, - {0, "debug", 'd'}, - {1, "init", 'i'}, - {1, "include", 'I'}, - {0, "no-paper", 'm'}, - {0, "dependencies", 'M'}, // like GCC - {0, "no-timestamps", 'T'}, // why do we have this option? - {0, "find-old-relative", 'Q'}, - {0, "ignore-version", 'V'}, - {0, "version", 'v'}, - {1, "output-format", 'f'}, - {0, "safe", 's'}, - {0,0,0} + {0, "debug", 'd', _i ("enable debugging output")}, + {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")}, + {0, "help", 'h', _i ("this help")}, + {_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 ("BASENAME"), "output", 'o', _i ("write output to BASENAME[-x].extension")}, + {0, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, + {0, "safe", 's', _i ("inhibit file output naming and exporting")}, + {0, "no-timestamps", 'T', _i ("don't timestamp the output")}, + {0, "test", 't', _i ("switch on experimental features")}, + {0, "version", 'v', _i ("print version number")}, + {0, "verbose", 'V', _i("verbose")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0,0,0, 0} }; +void +identify (ostream* os) +{ + //*os << gnu_lilypond_version_str () << endl; + *os << gnu_lilypond_version_str (); +} + void usage () { - cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond") << '\n'; - cout << _ ("Typeset music and or play MIDI from FILE or "); - cout << '\n'; + identify (&cout); + cout << "\n"; + 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 << _ ( - " -a, --about about LilyPond\n" - ); - cout << _ ( - " -d, --debug enable debugging output\n" - ); - cout << _ ( - " -M, --dependencies write Makefile dependencies for every input file\n" - ); - cout << _ ( - " -h, --help this help\n" - ); - cout << _ ( - " -f, --output-format=X use output format X\n" - ); - cout << _ ( - " -I, --include=DIR add DIR to search path\n" - ); - cout << _ ( - " -i, --init=FILE use FILE as init file\n" - ); - cout << _ ( - " -m, --no-paper produce midi output only\n" - ); - cout << _ ( - " -o, --output=FILE set FILE as default output base\n" - ); - cout << _ ( - " -Q, --find-old-relative show all changes in relative syntax\n" - ); - cout << _ ( - " -s, --safe inhibit file output naming and exporting TeX macros\n"); - cout << _ ( - " -t, --test switch on experimental features\n" - ); - cout << _ ( - " -T, --no-timestamps don't timestamp the output\n" - ); - cout << _ ( - " -V, --ignore-version ignore mudela version\n" - ); - cout << _ ( - " -w, --warranty show warranty and copyright\n" - ); - cout << '\n'; - cout << _ ("GNU LilyPond was compiled with the following settings:"); + cout << Long_option_init::table_str (theopts); cout << '\n'; - cout << + cout << _ ("This binary was compiled with the following options:") + << " " << #ifdef NDEBUG "NDEBUG " #endif @@ -145,44 +129,45 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif - "datadir=" DIR_DATADIR "\n" - "localedir=" DIR_LOCALEDIR - + "datadir: `" DIR_DATADIR "'\n" + "localedir: `" DIR_LOCALEDIR "'\n" "\n"; - ; - print_mudela_versions (cout); + cout << endl; + + cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; } void -about () +version () { + identify (&cout); cout << '\n'; - cout << -#include "BLURB.hh" - cout << '\n'; - cout << _ ("GNU LilyPond is Free software, see --warranty"); - cout << '\n'; - cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--1999"); - cout << '\n'; - cout << " " + _ ("Han-Wen Nienhuys ") + "\n"; - cout << " " + _ ("Jan Nieuwenhuizen ") + "\n"; - cout << '\n'; + cout << _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; + + cout << _f ("Copyright (c) %s by", "1996--2000"); + cout << "Han-Wen Nienhuys \n" + << "Jan Nieuwenhuizen \n"; } void notice () { cout << '\n'; + // GNU GNU? cout << _ ("GNU LilyPond -- The GNU Project music typesetter"); cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--1999"); + cout << _f ("Copyright (c) %s by", "1996--2000"); cout << '\n'; - cout << " " + _ ("Han-Wen Nienhuys ") + "\n"; - cout << " " + _ ("Jan Nieuwenhuizen ") + "\n"; + cout << " Han-Wen Nienhuys \n"; + cout << " Jan Nieuwenhuizen \n"; cout << '\n'; cout << _ ( " This program is free software; you can redistribute it and/or\n" @@ -200,12 +185,6 @@ notice () "USA.\n"); } -void -identify () -{ - *mlog << gnu_lilypond_version_str () << endl; -} - void setup_paths () { @@ -243,26 +222,50 @@ setup_paths () global_path.parse_path (env_sz); - char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", 0}; - for (char **s = suffixes; *s; s++){ - if (!prefix_directory.empty_b()) - global_path.add (prefix_directory + to_str ('/') + String (*s)); - else - global_path.add (String (DIR_DATADIR) + to_str ('/') + String(*s)); - } + /* + 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); + +#if !KPATHSEA + /* + Although kpathsea seems nice, it is not universally available + (GNU/Windows). + + Compiling kpathsea seems not possible without + (compiling) a matching tex installation. Apart from the fact + that I cannot get kpathsea compiled for GNU/Windows, another + major problem is that TeX installations may be different on + different clients, so it wouldn't work anyway. While ugly, + this code is simple and effective. + -- jcn + */ + + /* Urg: GNU make's $(word) index starts at 1 */ + int i = 1; + while (global_path.try_add (p + to_str (".") + to_str (i))) + i++; +#endif + } } void -main_prog (int argc, char **argv) +main_prog (int, char**) { /* need to do this first. Engravers use lily.scm contents. */ - extern void ly_init_protection(); - ly_init_protection(); init_lily_guile (); - read_lily_scm_file ( "lily.scm"); + if (verbose_global_b) + progress_indication ("\n"); + read_lily_scm_file ("lily.scm"); cout << endl; call_constructors (); @@ -319,21 +322,37 @@ main_prog (int argc, char **argv) int main (int argc, char **argv) { - identify (); debug_init (); // should be first 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"); + +#if KPATHSEA && HAVE_KPATHSEA_KPATHSEA_H + /* + initialize kpathsea + */ + kpse_set_program_name(argv[0], NULL); + kpse_maketex_option("tfm", TRUE); +#endif + oparser_global_p = new Getopt_long(argc, argv,theopts); while (Long_option_init const * opt = (*oparser_global_p)()) { - switch (opt->shortname) + switch (opt->shortname_ch_) { case 'v': + version(); exit (0); // we print a version anyway. break; case 't': experimental_features_global_b = true; - *mlog << "*** enabling experimental features, you're on your own now ***\n"; + progress_indication ("*** enabling experimental features, you're on your own now ***\n"); break; case 'o': outname_str_global = oparser_global_p->optional_argument_ch_C_; @@ -354,15 +373,12 @@ main (int argc, char **argv) case 'i': init_str_global = oparser_global_p->optional_argument_ch_C_; break; - case 'a': - about (); - exit (0); case 'h': usage (); exit (0); break; case 'V': - version_ignore_global_b = true; + verbose_global_b = true; break; case 's': safe_global_b = true; @@ -384,11 +400,12 @@ main (int argc, char **argv) break; } } + identify (&cerr); #ifdef WINNT gh_enter (argc, argv, main_prog); #else - gh_enter (argc, argv, (void(*)())main_prog); + gh_enter (argc, argv, (void(*)(...))main_prog); #endif return 0; // unreachable