X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=d9b1c6f315bd3895ef436ecd9084593af8cd72a5;hb=0713e9256dc1f35299ce716cf29ddeab4ebca93b;hp=cd2ee91d95cdfe45d2aacb01b24458eb5357db51;hpb=d40e9c64ed0a15f2ea0fcf5476b32efe9fd4ba5f;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index cd2ee91d95..d9b1c6f315 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -11,53 +11,87 @@ #include #include +#include "config.h" + +#if HAVE_GETTEXT +#include +#endif + #include "lily-guile.hh" #include "lily-version.hh" - #include "all-font-metrics.hh" -#include "proto.hh" #include "getopt-long.hh" #include "misc.hh" #include "string.hh" #include "main.hh" #include "file-path.hh" -#include "config.h" #include "file-results.hh" #include "debug.hh" #include "lily-guile.hh" #include "paper-def.hh" #include "midi-def.hh" #include "global-ctor.hh" +#include "kpath.hh" -#if HAVE_GETTEXT -#include -#endif +/* + Global options that can be overridden through command line. +*/ + +/* Write dependencies file? */ +bool dependency_global_b = false; + +/* Prepend to dependencies */ +String dependency_prefix_global; + +/* Names of header fields to be dumped to a separate file. */ +Array dump_header_fieldnames_global; + +/* Name of initialisation file. */ +String init_name_global; -bool version_ignore_global_b = false; +/* 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; -bool find_old_relative_b = false; -char const* output_global_ch = "tex"; -All_font_metrics *all_fonts_global_p; +/* Selected output format. + One of tex, ps, scm, as. */ +String output_format_global = "tex"; + +/* Current output name. */ +String output_name_global; + +/* Run in safe mode? -- FIXME: should be re-analised */ +bool safe_global_b = false; + +/* Verbose progress indication? */ +bool verbose_global_b = false; -String default_outname_base_global = "lelie"; -String outname_str_global; -String init_str_global; -int default_count_global; + +/* + Misc. global stuff. + */ + + +All_font_metrics *all_fonts_global_p; +int exit_status_global; File_path global_path; -bool safe_global_b = false; -bool experimental_features_global_b = false; -bool dependency_global_b = false; +/* 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; + -int exit_status_i_; -Getopt_long * oparser_global_p = 0; +/* + File globals. + */ -String distill_inname_str (String name_str, String& ext_r); +/* The option parser */ +static Getopt_long *oparser_p_static = 0; /* Internationalisation kludge in two steps: @@ -67,36 +101,37 @@ String distill_inname_str (String name_str, String& ext_r); Note: these messages all start with lower case (ie, don't follow regular localisation guidelines). */ -Long_option_init theopts[] = { - {0, "debug", 'd', _i ("enable debugging output")}, - {_i ("EXT"), "output-format", 'f', _i ("use output format EXT")}, +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 ("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 ("BASENAME"), "output", 'o', _i ("write output to BASENAME[-x].extension")}, - {0, "find-old-relative", 'Q', _i ("show all changes in relative syntax")}, + {_i ("NAME"), "output", 'o', _i ("write output to NAME")}, {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, "verbose", 'V', _i("verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0, 0} + {0,0,0,0} }; void identify (ostream* os) { - *os << gnu_lilypond_version_str () << endl; + *os << gnu_lilypond_version_str (); } void usage () { - identify (&cout); - cout << "\n"; + + /* + 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"); @@ -111,7 +146,7 @@ _( cout << '\n'; cout << _ ("Options:"); cout << '\n'; - cout << Long_option_init::table_str (theopts); + cout << Long_option_init::table_str (options_static); cout << '\n'; cout << _ ("This binary was compiled with the following options:") << " " << @@ -129,7 +164,7 @@ _( "localedir: `" DIR_LOCALEDIR "'\n" "\n"; - print_mudela_versions (cout); + cout << endl; cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl; @@ -148,16 +183,16 @@ version () cout << endl; cout << _f ("Copyright (c) %s by", "1996--2000"); - cout << "Han-Wen Nienhuys \n" - << "Jan Nieuwenhuizen \n"; + cout << '\n'; + cout << " Han-Wen Nienhuys \n"; + cout << " Jan Nieuwenhuizen \n"; } void notice () { cout << '\n'; - // GNU GNU? - cout << _ ("GNU LilyPond -- The GNU Project music typesetter"); + cout << _ ("GNU LilyPond -- The music typesetter"); cout << '\n'; cout << _f ("Copyright (c) %s by", "1996--2000"); cout << '\n'; @@ -217,16 +252,66 @@ setup_paths () global_path.parse_path (env_sz); - char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", "ps", 0}; + /* + 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++) { - 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)); + String p = prefix + to_str ('/') + String (*s); + global_path.add (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++; +#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.empty_b () || str == "-") + p.base = "-"; + else + { + String orig_ext = p.ext; + char const *extensions[] = {"ly", "fly", "sly", "", 0}; + for (int i = 0; extensions[i]; i++) + { + p.ext = orig_ext; + if (*extensions[i] && !p.ext.empty_b ()) + p.ext += "."; + p.ext += extensions[i]; + if (!global_path.find (p.str ()).empty_b ()) + break; + } + /* Reshuffle extension */ + p = split_path (p.str ()); + } + return p; +} + +String +format_to_ext (String format) +{ + if (format == "tex") + /* .lytex change put off */ + return "tex"; // "lytex"; + return format; +} void main_prog (int, char**) @@ -235,104 +320,129 @@ main_prog (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; 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 ())) + while ((arg = oparser_p_static->get_next_arg ()) || p == 0) { + String infile; - 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 = "-"; + if (arg) + infile = arg; 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; + 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 (); + } + + 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); + + /* 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 ()) + outpath = split_path (output_name_global); + + String init; + if (!init_name_global.empty_b ()) + init = init_name_global; + else if (!inpath.ext.empty_b ()) + init = "init." + inpath.ext; else - i = "init" + i; - do_one_file (i, f); + 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; + p++; } - if (!p) - { - 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_); + delete oparser_p_static; + exit (exit_status_global); } int main (int argc, char **argv) { - debug_init (); // should be first + debug_init (); // should be first (can see that; but Why?) setup_paths (); - oparser_global_p = new Getopt_long(argc, argv,theopts); - while (Long_option_init const * opt = (*oparser_global_p)()) + /* + 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)()) { switch (opt->shortname_ch_) { case 'v': - version(); + version (); exit (0); // we print a version anyway. break; - case 't': - experimental_features_global_b = true; - 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_; + { + String s = oparser_p_static->optional_argument_ch_C_; + Path p = split_path (s); + if (p.ext.empty_b ()) + p.ext = format_to_ext (output_format_global); + output_name_global = p.str (); + } break; case 'w': notice (); exit (0); break; case 'f': - output_global_ch = oparser_global_p->optional_argument_ch_C_; + output_format_global = oparser_p_static->optional_argument_ch_C_; + break; + case 'P': + dependency_prefix_global = oparser_p_static->optional_argument_ch_C_; break; - case 'Q': - find_old_relative_b= true; + case 'H': + dump_header_fieldnames_global.push (oparser_p_static->optional_argument_ch_C_); break; case 'I': - global_path.push (oparser_global_p->optional_argument_ch_C_); + global_path.push (oparser_p_static->optional_argument_ch_C_); break; case 'i': - init_str_global = oparser_global_p->optional_argument_ch_C_; + init_name_global = oparser_p_static->optional_argument_ch_C_; break; case 'h': usage (); exit (0); break; case 'V': - version_ignore_global_b = true; + verbose_global_b = true; break; case 's': safe_global_b = true; @@ -340,9 +450,6 @@ main (int argc, char **argv) case 'M': dependency_global_b = true; break; - case 'd': - set_debug (true); - break; case 'm': no_paper_global_b = true; break; @@ -359,53 +466,10 @@ main (int argc, char **argv) #ifdef WINNT gh_enter (argc, argv, main_prog); #else - gh_enter (argc, argv, (void(*)(...))main_prog); + gh_enter (argc, argv, (void(*)(int, char**))main_prog); #endif return 0; // unreachable } -/** - make input file name from command arg. - - @input file name - - @output file name with added default extension. "" is stdin. - in reference argument: the extension. ".ly" if none - */ -String -distill_inname_str (String name_str, String& ext_r) -{ - String str = name_str; - if (str.length_i ()) - { - if (str != "-") - { - String a,b,c; - split_path (str,a,b,c,ext_r); - - // add extension if not present. - char const* extensions[] = {"", ".ly", ".fly", ".sly", "", 0}; - extensions[0] = ext_r.ch_C (); - for (int i = 0; extensions[i]; i++) - { - 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 - { - str = "-"; - ext_r = ".ly"; - } - return str; -}