X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=75c9ea84d8be439d37006fc973fec8a1cea7a125;hb=9cf00174c8273860064dc7ccb51beddcdd7105eb;hp=b98056a3755a25259eec18eeacdb3a0e1f259c87;hpb=2007f11f76fb92b495ac33621539aa481873302a;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index b98056a375..75c9ea84d8 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ #include @@ -11,16 +11,20 @@ #include #include +#include "config.h" + +#if HAVE_GETTEXT +#include +#endif + #include "lily-guile.hh" #include "lily-version.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.h" #include "file-results.hh" #include "debug.hh" #include "lily-guile.hh" @@ -30,38 +34,63 @@ #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; -bool verbose_global_b = false; +/* Name of initialisation file. */ +String init_name_global; + +/* Do not calculate and write paper output? */ bool no_paper_global_b = false; -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; -String default_outname_base_global = "lelie"; -String outname_str_global; -String init_str_global; +/* Run in safe mode? -- FIXME: should be re-analised */ +bool safe_global_b = false; + +/* Verbose progress indication? */ +bool verbose_global_b = false; -int default_count_global; +/* Scheme code to execute before parsing, after .scm init */ +String init_scheme_code_string = "(begin #t "; + + +/* + Misc. global stuff. + */ + + +All_font_metrics *all_fonts_global_p; +int exit_status_global; File_path global_path; -Array global_score_header_fields; +/* 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; -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; +/* + 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: @@ -71,29 +100,27 @@ 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[] = { +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, "version", 'v', _i ("print version number")}, - {0, "verbose", 'V', _i("verbose")}, + {0, "verbose", 'V', _i ("verbose")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0, 0} + {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")}, + {0,0,0,0} }; void identify (ostream* os) { - //*os << gnu_lilypond_version_str () << endl; *os << gnu_lilypond_version_str (); } @@ -109,7 +136,7 @@ usage () 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" @@ -118,7 +145,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:") << " " << @@ -154,19 +181,19 @@ version () "lilypond"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2000"); - cout << "Han-Wen Nienhuys \n" - << "Jan Nieuwenhuizen \n"; + cout << _f ("Copyright (c) %s by", "1996--2001"); + 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 << _f ("Copyright (c) %s by", "1996--2001"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -207,10 +234,10 @@ setup_paths () urg; what *do* we want with $LILYPONDPREFIX, DIR_DATADIR and $prefix/share handy for multiple source-dir runs, though... */ - if (!prefix_directory.empty_b()) + if (!prefix_directory.empty_b ()) { lily_locale_dir = prefix_directory + "/share/locale"; - bindtextdomain (name.ch_C (), lily_locale_dir.ch_C()); + bindtextdomain (name.ch_C (), lily_locale_dir.ch_C ()); } else bindtextdomain (name.ch_C (), DIR_LOCALEDIR); @@ -237,7 +264,7 @@ setup_paths () global_path.add (p); #if !KPATHSEA - /* Urg: GNU make's $(word) index starts at 1 */ + /* Urg: GNU make's $ (word) index starts at 1 */ int i = 1; while (global_path.try_add (p + to_str (".") + to_str (i))) i++; @@ -245,6 +272,45 @@ setup_paths () } } +/** + 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**) @@ -259,106 +325,139 @@ main_prog (int, char**) cout << endl; call_constructors (); - default_outname_base_global = "lelie"; all_fonts_global_p = new All_font_metrics (global_path.str ()); + + init_scheme_code_string += ")"; + gh_eval_str ((char *)init_scheme_code_string.ch_C()); 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); } +static int +sane_putenv (char const* key, char const* value) +{ + /* + putenv is POSIX, setenv is BSD 4.3 + Urg, but putenv blindly overwrites environment settings. + */ + if (!getenv (key)) + return putenv ((char*)((String (key) + "=" + value).ch_C ())); + return -1; +} int main (int argc, char **argv) { - debug_init (); // should be first + debug_init (); // should be first (can see that; but Why?) setup_paths (); - /* - prepare guile for heavy mem usage. + /* Prepare GUILE for heavy memory usage. If you have plenty memory, + this may speed up GUILE a bit. If you're short on memory, these + settings + + export GUILE_INIT_SEGMENT_SIZE_1=36000 + export GUILE_MAX_SEGMENT_SIZE=576000 - putenv is POSIX, setenv is BSD 4.3 - */ - putenv ("GUILE_INIT_SEGMENT_SIZE_1=4194304"); - putenv ("GUILE_MAX_SEGMENT_SIZE=8388608"); + may considerably decrease memory footprint (~*0.85), with a small + execution time penalty (~*1.10). */ + + sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304"); + sane_putenv ("GUILE_MAX_SEGMENT_SIZE", "8388608"); ly_init_kpath (argv[0]); - oparser_global_p = new Getopt_long(argc, argv,theopts); - while (Long_option_init const * opt = (*oparser_global_p)()) + 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 'e': + init_scheme_code_string += + oparser_p_static->optional_argument_ch_C_; 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 'Q': - find_old_relative_b= true; + case 'P': + dependency_prefix_global = oparser_p_static->optional_argument_ch_C_; break; case 'H': - global_score_header_fields.push (oparser_global_p->optional_argument_ch_C_); + 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 (); @@ -376,9 +475,6 @@ main (int argc, char **argv) case 'm': no_paper_global_b = true; break; - case 'T': - no_timestamps_global_b = true; - break; default: assert (false); break; @@ -389,53 +485,10 @@ main (int argc, char **argv) #ifdef WINNT gh_enter (argc, argv, main_prog); #else - gh_enter (argc, argv, (void(*)(int, char**))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; -}