X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=cd2ee91d95cdfe45d2aacb01b24458eb5357db51;hb=d40e9c64ed0a15f2ea0fcf5476b32efe9fd4ba5f;hp=6cd822b26545427654acebc7c5352fb0e970eb3c;hpb=07d4d05df6479d58c3c5152c07d7c86b94ee98b4;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 6cd822b265..cd2ee91d95 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,19 +3,19 @@ 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 "all-font-metrics.hh" #include "proto.hh" -#include "dimensions.hh" #include "getopt-long.hh" #include "misc.hh" #include "string.hh" @@ -63,35 +63,50 @@ 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[] = { - {_i ("BASENAME"), "output", 'o', _i ("write output to BASENAME[-x].extension")}, - {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0, "help", 'h', _i ("this help")}, - {0, "test", 't', _i ("switch on experimental features")}, {0, "debug", 'd', _i ("enable debugging output")}, - {_i ("FILE"), "init", 'i', _i ("use FILE as init file")}, + {_i ("EXT"), "output-format", 'f', _i ("use output format EXT")}, + {0, "help", 'h', _i ("this help")}, {_i ("DIR"), "include", 'I', _i ("add DIR to search path")}, - {0, "no-paper", 'm', _i ("produce midi output only")}, + {_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, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, + {0, "test", 't', _i ("switch on experimental features")}, {0, "ignore-version", 'V', _i ("ignore mudela version")}, {0, "version", 'v', _i ("print version number")}, - {_i ("EXT"), "output-format", 'f', _i ("use output format EXT")}, - {0, "safe", 's', _i ("inhibit file output naming and exporting")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, {0,0,0, 0} }; +void +identify (ostream* os) +{ + *os << gnu_lilypond_version_str () << endl; +} + void usage () { + identify (&cout); + cout << "\n"; cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond"); cout << "\n\n"; - cout << _ ("Typeset music and or play MIDI from FILE."); + cout << _ ("Typeset music and or play MIDI from FILE"); cout << "\n\n"; cout << -#include "BLURB.hh" +_( +"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:"); @@ -109,36 +124,30 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif - "datadir =" DIR_DATADIR "\n" - "localedir =" DIR_LOCALEDIR - - "\n\n"; - - cout << _("Report bugs to") << " bug-gnu-music@gnu.org" << endl; + "datadir: `" DIR_DATADIR "'\n" + "localedir: `" DIR_LOCALEDIR "'\n" + "\n"; print_mudela_versions (cout); -} + cout << endl; -void -identify () -{ - cout << gnu_lilypond_version_str () << endl; + cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; } void version () { - identify (); + identify (&cout); cout << '\n'; cout << _f ("" - "This is free software. It is covered by the GNU General Public License," - "and you are welcome to change it and/or distribute copies of it under" + "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--1999"); + cout << _f ("Copyright (c) %s by", "1996--2000"); cout << "Han-Wen Nienhuys \n" << "Jan Nieuwenhuizen \n"; } @@ -150,7 +159,7 @@ notice () // 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"; @@ -171,7 +180,6 @@ notice () "USA.\n"); } - void setup_paths () { @@ -210,12 +218,13 @@ setup_paths () char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", "ps", 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)); - } + 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)); + } } @@ -225,10 +234,8 @@ 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"); + read_lily_scm_file ("lily.scm"); cout << endl; call_constructors (); @@ -299,7 +306,7 @@ main (int argc, char **argv) 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_; @@ -347,7 +354,7 @@ main (int argc, char **argv) break; } } - identify (); + identify (&cerr); #ifdef WINNT gh_enter (argc, argv, main_prog);