/* 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;
-
/* Selected output format.
One of tex, ps, scm, as. */
String output_format_global = "tex";
/* Verbose progress indication? */
bool verbose_global_b = false;
+/* Scheme code to execute before parsing, after .scm init */
+String init_scheme_code_string = "(begin #t ";
/*
follow regular localisation guidelines).
*/
static Long_option_init options_static[] = {
- {_i ("EXT"), "output-format", 'f', _i ("use output format EXT (scm, ps, tex or as)")},
+ /* print example usage: lilypond -e "(set-lily-option 'help 0)" ? */
+ {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
+ /* another bug in option parser: --output=foe is taken as an abbreviation
+ for --output-format */
+ {_i ("EXT"), "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 ("NAME"), "output", 'o', _i ("write output to NAME")},
+ {_i ("FILE"), "output", 'o', _i ("write output to FILE")},
+ {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")},
{0, "safe", 's', _i ("inhibit file output naming and exporting")},
- {0, "no-timestamps", 'T', _i ("don't timestamp the output")},
{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}
};
/*
No version number or newline here. It confuses help2man
*/
- cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond");
+ 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 << endl;
- cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
+ cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl;
}
void
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);
global_path.parse_path (env_sz);
- /*
- Should use kpathsea, this is getting out of hand.
- */
- char *suffixes[] = {"ly", "afm", "scm", "tfm", "ps", 0};
+ /* Adding mf/out make lilypond unchanged source directory, when setting
+ LILYPONDPREFIX to lilypond-x.y.z */
+ char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0};
String prefix = prefix_directory;
if (prefix.empty_b ())
prefix = DIR_DATADIR;
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++;
call_constructors ();
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_p_static->get_next_arg ()) || p == 0)
+ const char *arg = oparser_p_static->get_next_arg ();
+
+ if (!arg)
{
- String infile;
-
- if (arg)
- infile = arg;
- else
- 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 == "")
+ usage ();
+ /* No FILE arguments is now a usage error */
+ exit (2);
+ }
+ else
+ do
+ {
+ String infile (arg);
+
+ /* 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 ();
output_name_global = save_output_name_global;
p++;
- }
+ } while ((arg = oparser_p_static->get_next_arg ()));
delete oparser_p_static;
+ oparser_p_static = 0;
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 (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). However, if this 15% gain in memory
+ usage prevents swapping, the execution time falls drastically. */
+
+ sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304");
+ sane_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)())
+ oparser_p_static = new Getopt_long (argc, argv, options_static);
+ while (Long_option_init const * opt = (*oparser_p_static) ())
{
switch (opt->shortname_ch_)
{
{
String s = oparser_p_static->optional_argument_ch_C_;
Path p = split_path (s);
- if (p.ext.empty_b ())
+ if (s != "-" && 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);
case 'm':
no_paper_global_b = true;
break;
- case 'T':
- no_timestamps_global_b = true;
- break;
default:
assert (false);
break;
#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
projects / lilypond.git / blobdiff