X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmain.cc;h=246e763587dedb250b34d6b4a411b51395ecce3d;hb=82731e802565546441c401a84a13b486e54eb760;hp=74543baf2cc819e3f34afd6f0e6e59f628b9aa72;hpb=ab8cc216b5483e35ed900c2761cb5a627bc419f4;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 74543baf2c..246e763587 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--1999 Han-Wen Nienhuys */ #include @@ -11,21 +11,23 @@ #include #include #include "lily-guile.hh" +#include "lily-version.hh" +#include "all-font-metrics.hh" #include "proto.hh" #include "dimensions.hh" -#include "plist.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 "ps-lookup.hh" -#include "tex-lookup.hh" #include "lily-guile.hh" +#include "paper-def.hh" +#include "midi-def.hh" +#include "global-ctor.hh" #if HAVE_GETTEXT #include @@ -35,91 +37,76 @@ bool version_ignore_global_b = false; bool no_paper_global_b = false; bool no_timestamps_global_b = false; -bool find_quarts_global_b = false; +bool find_old_relative_b = false; + +char const* output_global_ch = "tex"; +All_font_metrics *all_fonts_global_p; + String default_outname_base_global = "lelie"; +String outname_str_global; +String init_str_global; + int default_count_global; File_path global_path; -Ps_lookup ps_lookup; -Tex_lookup tex_lookup; -Lookup* global_lookup_l = &tex_lookup; - +bool safe_global_b = false; bool experimental_features_global_b = false; bool dependency_global_b = false; int exit_status_i_; +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", 'd'}, - {0, "no-timestamps", 'T'}, - {0, "find-fourths", 'Q'}, - {0, "ignore-version", 'V'}, - {0,0,0} + {0, "debug", 'd', _i ("enable debugging output")}, + {_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")}, + {_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, "ignore-version", 'V', _i ("ignore mudela version")}, + {0, "version", 'v', _i ("print version number")}, + {0, "warranty", 'w', _i ("show warranty and copyright")}, + {0,0,0, 0} }; void usage () { - cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond") << '\n'; - cout << _ ("Typeset music and or play MIDI from FILE or "); - 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 << _ ( - " -d, --dependencies write Makefile dependencies for every input file\n" - ); - cout << _ ( - " -I, --include=DIR add DIR to search path\n" - ); - cout << _ ( - " -i, --init=FILE use FILE as init file\n" - ); - cout << _ ( - " -h, --help this help\n" - ); - cout << _ ( - " -M, --no-paper produce midi output only\n" - ); - cout << _ ( - " -o, --output=FILE set FILE as default output base\n" - ); - cout << _ ( - " -Q, --find-fourths show all intervals greater than a fourth\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 @@ -129,67 +116,71 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif - "datadir=" DIR_DATADIR - " " - "localedir=" DIR_LOCALEDIR - + "\n" + "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 +identify () +{ + cout << gnu_lilypond_version_str () << endl; } void -about () +version () { + identify (); 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, 1997, 1998"); - 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--1999"); + 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, 1997, 1998"); + cout << _f ("Copyright (c) %s by", "1996--1999"); 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" - "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., 675 Mass Ave, Cambridge, MA 02139,\n" - "USA.\n"); + " 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., 675 Mass Ave, Cambridge, MA 02139,\n" + "USA.\n"); } -void -identify () -{ - *mlog << get_version_str () << endl; -} void -main_prog (int argc, char **argv) +setup_paths () { // facilitate binary distributions char const *env_lily = getenv ("LILYPONDPREFIX"); @@ -203,6 +194,11 @@ main_prog (int argc, char **argv) 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"; @@ -213,57 +209,122 @@ main_prog (int argc, char **argv) textdomain (name.ch_C ()); #endif - identify (); - call_constructors (); - debug_init (); // should be first - 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); - if (!prefix_directory.empty_b()) + + 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)); + } +} + + +void +main_prog (int, char**) +{ + /* + need to do this first. Engravers use lily.scm contents. + */ + init_lily_guile (); + read_lily_scm_file ( "lily.scm"); + cout << endl; + + call_constructors (); + default_outname_base_global = "lelie"; + all_fonts_global_p = new All_font_metrics (global_path.str ()); + + int p=0; + const char *arg ; + while ((arg= oparser_global_p->get_next_arg ())) + { + + if (outname_str_global == "") + { + Midi_def::reset_default_count (); + Paper_def::reset_default_count (); + } + String f (arg); + String i; + f = distill_inname_str (f, i); + if (f == "-") + default_outname_base_global = "-"; + else + { + String a,b,c,d; + split_path (f, a, b, c, d); + default_outname_base_global = c; + } + if (outname_str_global.length_i ()) + default_outname_base_global = outname_str_global; + if (init_str_global.length_i ()) + i = init_str_global; + else + i = "init" + i; + do_one_file (i, f); + p++; + } + if (!p) { - global_path.add (prefix_directory + "/share/lilypond/init/"); - global_path.add (prefix_directory + "/share/lilypond"); + String i; + if (init_str_global.length_i ()) + i = init_str_global; + else + i = "init.ly"; + default_outname_base_global = "-"; + if (outname_str_global.length_i ()) + default_outname_base_global = outname_str_global; + do_one_file (i, default_outname_base_global); } + delete oparser_global_p; + exit( exit_status_i_); +} - global_path.add (String (DIR_DATADIR) + "/ly/"); - global_path.add (String (DIR_DATADIR) + "/afm/"); - Getopt_long oparser (argc, argv,theopts); - String init_str; +int +main (int argc, char **argv) +{ + debug_init (); // should be first + setup_paths (); - String outname_str; - while (Long_option_init const * opt = oparser ()) + 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; - global_lookup_l = &ps_lookup; *mlog << "*** enabling experimental features, you're on your own now ***\n"; break; case 'o': - outname_str = oparser.optional_argument_ch_C_; + outname_str_global = oparser_global_p->optional_argument_ch_C_; break; case 'w': notice (); exit (0); break; + case 'f': + output_global_ch = oparser_global_p->optional_argument_ch_C_; + break; case 'Q': - find_quarts_global_b = true; + find_old_relative_b= true; break; case 'I': - global_path.push (oparser.optional_argument_ch_C_); + global_path.push (oparser_global_p->optional_argument_ch_C_); break; case 'i': - init_str = oparser.optional_argument_ch_C_; + init_str_global = oparser_global_p->optional_argument_ch_C_; break; - case 'a': - about (); - exit (0); case 'h': usage (); exit (0); @@ -271,13 +332,16 @@ main_prog (int argc, char **argv) case 'V': version_ignore_global_b = true; break; - case 'd': + case 's': + safe_global_b = true; + break; + case 'M': dependency_global_b = true; break; - case 'D': + case 'd': set_debug (true); break; - case 'M': + case 'm': no_paper_global_b = true; break; case 'T': @@ -288,67 +352,23 @@ main_prog (int argc, char **argv) break; } } + identify (); - default_outname_base_global = "lelie"; - - - - int p=0; - const char *arg ; - while ((arg= oparser.get_next_arg ())) - { - String f (arg); - String i; - f = distill_inname_str (f, i); - if (f == "-") - default_outname_base_global = "-"; - else - { - String a,b,c,d; - split_path (f, a, b, c, d); - default_outname_base_global = c; - } - if (outname_str.length_i ()) - default_outname_base_global = outname_str; - if (init_str.length_i ()) - i = init_str; - else - i = "init" + i; - do_one_file (i, f); - p++; - } - if (!p) - { - String i; - if (init_str.length_i ()) - i = init_str; - else - i = "init.ly"; - default_outname_base_global = "-"; - if (outname_str.length_i ()) - default_outname_base_global = outname_str; - do_one_file (i, default_outname_base_global); - } -} - -int -main (int argc, char **argv) -{ -#ifdef HAVE_LIBGUILE - gh_enter (argc, argv, (void(*)())main_prog); - return exit_status_i_; +#ifdef WINNT + gh_enter (argc, argv, main_prog); #else - main_prog (argc, argv); - return exit_status_i_; + gh_enter (argc, argv, (void(*)(...))main_prog); #endif + + return 0; // unreachable } -/* - urg: make input file name: +/** + make input file name from command arg. - input: file name + @input file name - output: file name with added default extension. "" is stdin. + @output file name with added default extension. "" is stdin. in reference argument: the extension. ".ly" if none */ String @@ -363,13 +383,20 @@ distill_inname_str (String name_str, String& ext_r) split_path (str,a,b,c,ext_r); // add extension if not present. - if (ext_r.empty_b ()) + char const* extensions[] = {"", ".ly", ".fly", ".sly", "", 0}; + extensions[0] = ext_r.ch_C (); + for (int i = 0; extensions[i]; i++) { - ext_r = ".fly"; - if (global_path.find (a+b+c+ext_r).empty_b ()) - ext_r = ".ly"; + if (!global_path.find (a+b+c+extensions[i]).empty_b ()) + { + ext_r = extensions[i]; + break; + } } str = a+b+c+ext_r; + // in any case, assume (init).ly + if (!ext_r.length_i ()) + ext_r = ".ly"; } } else