X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=9adf5a59419f5e97679217da4bc9ad58829ffd0f;hb=31653bf1d61a33ef8bc8c871d60c6b3452d04d28;hp=85968ddb1429b31108efae2129d93e4c7b79c468;hpb=5e47fbe9f5a8e10458a9d737d1c35cff2eae6791;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 85968ddb14..9adf5a5941 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,67 +3,126 @@ source file of the GNU LilyPond music typesetter - (c) 1997 Han-Wen Nienhuys + (c) 1997--1998 Han-Wen Nienhuys */ +#include #include #include +#include +#include "lily-guile.hh" + #include "proto.hh" +#include "dimensions.hh" #include "plist.hh" -#include "lgetopt.hh" +#include "getopt-long.hh" #include "misc.hh" #include "string.hh" #include "main.hh" -#include "path.hh" +#include "file-path.hh" #include "config.hh" -#include "source.hh" +#include "file-results.hh" #include "debug.hh" -#include "my-lily-parser.hh" +#include "lily-guile.hh" + +#if HAVE_GETTEXT +#include +#endif -static bool version_ignore_b = false; -Sources* source_global_l = 0; + +bool version_ignore_global_b = false; bool no_paper_global_b = false; +bool no_timestamps_global_b = false; +bool find_quarts_global_b = false; + +char const* output_global_ch = "tex"; +// temporarily default to ps, because tex is even more broken +//char const* output_global_ch = "ps"; + +String default_outname_base_global = "lelie"; +int default_count_global; +File_path global_path; bool experimental_features_global_b = false; -bool postscript_global_b = true; +bool dependency_global_b = false; + int exit_status_i_; -void destill_inname (String &name_str_r); +String distill_inname_str (String name_str, String& ext_r); Long_option_init theopts[] = { + {0, "about", 'a'}, {1, "output", 'o'}, {0, "warranty", 'w'}, {0, "help", 'h'}, {0, "test", 't'}, - {0, "debug", 'd'}, + {0, "debug", 'D'}, {1, "init", 'i'}, {1, "include", 'I'}, {0, "no-paper", 'M'}, - {0, "no-postscript", 'P'}, + {0, "dependencies", 'd'}, + {0, "no-timestamps", 'T'}, + {0, "find-fourths", 'Q'}, {0, "ignore-version", 'V'}, + {1, "output-format", 'f'}, {0,0,0} }; void usage () { - cout << - _("Usage: lilypond [options] [mudela-files]\n" - "Typeset and or produce midi output from mudela-file or stdin\n" - "\n" - "Options:\n" - " -d, --debug enable debugging output\n" + cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond") << '\n'; + cout << _ ("Typeset music and or play MIDI from FILE or "); + cout << '\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 << _ ( + " -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" - " -h, --help this help\n" - " -w, --warranty show warranty and copyright\n" - " -o, --output=FILE set FILE as default output\n" - " -t, --test switch on experimental features\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" - " -P, --no-postscript don't use PostScript\n" - "\n" - "GNU LilyPond was compiled with the following settings:\n") + ); + cout << _ ( + " -w, --warranty show warranty and copyright\n" + ); + cout << '\n'; + cout << _ ("GNU LilyPond was compiled with the following settings:"); + cout << '\n'; + cout << #ifdef NDEBUG "NDEBUG " #endif @@ -73,25 +132,44 @@ usage () #ifdef STRING_UTILS_INLINED "STRING_UTILS_INLINED " #endif - "datadir= " DIR_DATADIR + "datadir=" DIR_DATADIR + " " + "localedir=" DIR_LOCALEDIR "\n"; ; +} - +void +about () +{ + 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'; } void notice () { - cout << - _("\n" - "GNU LilyPond -- The GNU Project music typesetter.\n" - "Copyright 1996, 97, 98 by\n" - " Han-Wen Nienhuys \n" - " Jan Nieuwenhuizen \n" - "\n" + cout << '\n'; + cout << _ ("GNU LilyPond -- The GNU Project music typesetter"); + 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 << _ ( " 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" @@ -107,153 +185,215 @@ notice () "USA.\n"); } - -static File_path path; +void +identify () +{ + *mlog << get_version_str () << endl; +} void -do_one_file (String init_str, String file_str) +setup_paths () { - if (init_str.length_i () && path.find (init_str).empty_b ()) + // facilitate binary distributions + char const *env_lily = getenv ("LILYPONDPREFIX"); + String prefix_directory; + if (env_lily) + prefix_directory = env_lily; + +#if HAVE_GETTEXT + setlocale (LC_ALL, ""); /* enable locales */ + setlocale (LC_NUMERIC, "C"); /* musn't have comma's in TeX output... */ + String lily_locale_dir; + String name (PACKAGE); + name.to_lower (); + if (!prefix_directory.empty_b()) { - error (_("Can not find `") + init_str +"\'"); - return ; + lily_locale_dir = prefix_directory + "/share/locale"; + bindtextdomain (name.ch_C (), lily_locale_dir.ch_C()); } - if (file_str.length_i () && path.find (file_str).empty_b ()) + else + bindtextdomain (name.ch_C (), DIR_LOCALEDIR); + textdomain (name.ch_C ()); +#endif + + 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()) { - error (_("Can not find `") + file_str + "'"); - return ; + global_path.add (prefix_directory + "/share/lilypond/ly/"); + global_path.add (prefix_directory + "/share/lilypond/afm/"); + } + else + { + global_path.add (String (DIR_DATADIR) + "/ly/"); + global_path.add (String (DIR_DATADIR) + "/afm/"); } - - Sources sources; - source_global_l = &sources; - source_global_l->set_path (&path); - { - My_lily_parser parser (source_global_l); - parser.set_version_check (version_ignore_b); - parser.parse_file (init_str, file_str); - - if (file_str.length_i () && file_str[0] != '-') - { - String a,b,c,d; - split_path (file_str, a, b, c, d); - default_outname_base_global = c; - } - else - default_outname_base_global = "lelie"; - - if (parser.error_level_i_) - { - exit_status_i_ = 1; - } - else - do_scores (); - clear_scores (); - } - source_global_l = 0; } -void -identify () -{ - cout << get_version_str () << endl; -} -int -main (int argc, char **argv) + +void +main_prog (int argc, char **argv) { identify (); call_constructors (); debug_init (); // should be first + setup_paths (); - // must override (come before) "/usr/local/share/lilypond"! - char const *env_sz = getenv ("LILYINCLUDE"); - if (env_sz) - path.parse_path (env_sz); - - path.add (""); - path.add (String (DIR_DATADIR) + "/init/"); - - path.push (DIR_DATADIR); + String init_str; + String outname_str; Getopt_long oparser (argc, argv,theopts); - String init_str ("lily-init.ly"); - while (Long_option_init const * opt = oparser ()) { switch (opt->shortname) { case 't': experimental_features_global_b = true; + *mlog << "*** enabling experimental features, you're on your own now ***\n"; break; case 'o': - default_outname_base_global = oparser.optional_argument_ch_C_; + outname_str = oparser.optional_argument_ch_C_; break; case 'w': notice (); exit (0); break; + case 'f': + output_global_ch = oparser.optional_argument_ch_C_; + break; + case 'Q': + find_quarts_global_b = true; + break; case 'I': - path.push (oparser.optional_argument_ch_C_); + global_path.push (oparser.optional_argument_ch_C_); break; case 'i': init_str = oparser.optional_argument_ch_C_; break; + case 'a': + about (); + exit (0); case 'h': usage (); exit (0); break; case 'V': - version_ignore_b = true; - break; - case 'P': - postscript_global_b = false; + version_ignore_global_b = true; break; case 'd': + dependency_global_b = true; + break; + case 'D': set_debug (true); break; case 'M': no_paper_global_b = true; break; + case 'T': + no_timestamps_global_b = true; + break; default: assert (false); break; } } + default_outname_base_global = "lelie"; + + + int p=0; const char *arg ; while ((arg= oparser.get_next_arg ())) { String f (arg); - destill_inname (f); - do_one_file (init_str,f); + 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) { - do_one_file (init_str, ""); + 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); } + exit( exit_status_i_); +} +int +main (int argc, char **argv) +{ +#ifdef HAVE_LIBGUILE + gh_enter (argc, argv, (void(*)())main_prog); return exit_status_i_; +#else + main_prog (argc, argv); + return exit_status_i_; +#endif } -/// make input file name: add default extension. "" is stdin. -void -destill_inname (String &name_str_r) +/** + 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) { - if (name_str_r.length_i ()) + String str = name_str; + if (str.length_i ()) { - if (name_str_r[ 0 ] != '-') + if (str != "-") { - String a,b,c,d; - split_path (name_str_r,a,b,c,d); + String a,b,c; + split_path (str,a,b,c,ext_r); // add extension if not present. - if (d.empty_b ()) - d = ".ly"; - name_str_r = a+b+c+d; + // UGH. Should parametrise in list of default extensions. + if (ext_r.empty_b ()) + { + ext_r = ".fly"; + if (global_path.find (a+b+c+ext_r).empty_b ()) + ext_r = ".ly"; + } + str = a+b+c+ext_r; } } - else name_str_r = ""; + else + { + str = "-"; + ext_r = ".ly"; + } + return str; } +