X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=de3741ed3ff85fc1927d59dd7e1f84d3e54415d1;hb=55d1940131f7ce2fa26e4de1e428c6c42c3d41b9;hp=c9a60ca970218c7da02314f358c68bc09757fbc6;hpb=d7b187976cff5a17b795c150d4703ded396b17a0;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index c9a60ca970..de3741ed3f 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -12,48 +12,38 @@ #include #include -#include "config.h" +#include "config.hh" #if HAVE_GETTEXT #include #endif -#include "lily-guile.hh" -#include "lily-version.hh" #include "all-font-metrics.hh" +#include "file-name.hh" +#include "file-path.hh" #include "getopt-long.hh" +#include "global-ctor.hh" +#include "kpath.hh" +#include "lily-guile.hh" +#include "lily-version.hh" +#include "main.hh" #include "misc.hh" +#include "output-def.hh" #include "string.hh" -#include "main.hh" -#include "file-path.hh" -#include "input-file-results.hh" #include "warn.hh" -#include "lily-guile.hh" -#include "paper-def.hh" -#include "midi-def.hh" -#include "global-ctor.hh" -#include "kpath.hh" - -Array failed_files; /* * 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; -/* Do not calculate and write paper output? */ -bool no_paper_global_b = false; +/* Do not calculate and write layout output? */ +bool no_layout_global_b = false; /* Selected output format. One of tex, ps, scm, as. */ @@ -73,13 +63,16 @@ bool verbose_global_b = false; */ String init_scheme_code_string = "(begin #t "; - +bool make_pdf = false; +bool make_dvi = false; +bool make_ps = false; +bool make_png = false; +bool make_preview = false; +bool make_tex = false; /* * Miscellaneous global stuff. */ - -int exit_status_global; File_path global_path; @@ -91,13 +84,13 @@ static char const *AUTHORS = " Han-Wen Nienhuys \n" " Jan Nieuwenhuizen \n"; -static char const *PROGRAM_NAME = "lilypond-bin"; +static char const *PROGRAM_NAME = "lilypond"; static char const *PROGRAM_URL = "http://lilypond.org"; static char const *NOTICE = _i ("This program is free software. It is covered by the GNU General Public\n" "License and you are welcome to change it and/or distribute copies of it\n" - "under certain conditions. Invoke as `lilypond-bin --warranty' for more\n" + "under certain conditions. Invoke as `lilypond --warranty' for more\n" "information.\n"); static char const *WARRANTY = @@ -131,18 +124,22 @@ static Getopt_long *option_parser = 0; static Long_option_init options_static[] = { {_i ("EXPR"), "evaluate", 'e', - _i ("set options, use -e '(ly-option-usage)' for help")}, + _i ("set options, use -e '(ly:option-usage)' for help")}, /* Bug in option parser: --output=foe is taken as an abbreviation for --output-format. */ - {_i ("EXT"), "format", 'f', _i ("use output format EXT")}, + {_i ("EXT"), "format", 'f', _i ("select back-end to use")}, {0, "help", 'h', _i ("print 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")}, - {0, "no-paper", 'm', _i ("produce MIDI output only")}, + {0, "no-layout", 'm', _i ("produce MIDI output only")}, {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, - {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, + {0, "preview", 'p', _i ("generate a preview")}, + {0, "png", 0, _i ("generate PNG")}, + {0, "ps", 0, _i ("generate PostScript")}, + {0, "dvi", 0, _i ("generate DVI")}, + {0, "pdf", 0, _i ("generate PDF (default)")}, + {0, "tex", 0, _i ("generate TeX")}, {0, "safe-mode", 's', _i ("run in safe mode")}, {0, "version", 'v', _i ("print version number")}, {0, "verbose", 'V', _i ("be verbose")}, @@ -154,12 +151,12 @@ static void dir_info (FILE *out) { fputs ("\n", out); - fprintf (out, "lilypond_datadir: `%s'\n", LILYPOND_DATADIR); - fprintf (out, "local_lilypond_datadir: `%s'\n", LOCAL_LILYPOND_DATADIR); - fprintf (out, "localedir: `%s'\n", LOCALEDIR); + fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR); + fprintf (out, "LOCAL_LILYPOND_DATADIR=\%s\"\n", LOCAL_LILYPOND_DATADIR); + fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR); char *lilypond_prefix = getenv ("LILYPONDPREFIX"); - fprintf (out, "LILYPONDPREFIX: `%s'\n", + fprintf (out, "LILYPONDPREFIX=\"%s\"\n", (lilypond_prefix ? lilypond_prefix : "")); } @@ -225,7 +222,7 @@ setup_paths () if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) prefix_directory[1] = lilypond_prefix; - global_path.add (""); + global_path.append (""); /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ @@ -240,7 +237,7 @@ setup_paths () #if !KPATHSEA /* Urg: GNU make's $ (word) index starts at 1 */ int i = 1; - while (global_path.try_add (p + to_string (".") + to_string (i))) + while (global_path.try_append (p + to_string (".") + to_string (i))) i++; #endif } @@ -253,6 +250,46 @@ prepend_load_path (String dir) scm_c_eval_string (s.to_str0 ()); } +static void +determine_output_options () +{ + + bool found_tex = false; + SCM formats = ly_output_formats (); + for (SCM s = formats; scm_is_pair (s); s = scm_cdr (s)) + { + found_tex = found_tex || (ly_scm2string (scm_car (s)) == "tex"); + } + + + if (make_ps && found_tex) + { + make_dvi = true; + } + if (make_pdf || make_png) + { + make_ps = true; + } + if (make_dvi && found_tex) + { + make_tex = true; + } + if (!(make_dvi + || make_tex + || make_ps + || make_png + || make_pdf)) + { + make_pdf = true; + make_ps = true; + if (found_tex) + { + make_dvi = true; + make_tex = true; + } + } +} + static void main_with_guile (void *, int, char **) { @@ -265,7 +302,6 @@ main_with_guile (void *, int, char **) prepend_load_path (String (prefix_directory[i]) + "/scm"); } - if (verbose_global_b) dir_info (stderr); @@ -273,6 +309,7 @@ main_with_guile (void *, int, char **) call_constructors (); progress_indication ("\n"); + determine_output_options (); all_fonts_global = new All_font_metrics (global_path.to_string ()); init_scheme_code_string += ")"; @@ -281,38 +318,32 @@ main_with_guile (void *, int, char **) /* We accept multiple independent music files on the command line to reduce compile time when processing lots of small files. Starting the GUILE engine is very time consuming. */ - bool first = true; + + SCM files = SCM_EOL; + SCM *tail = &files; while (char const *arg = option_parser->get_next_arg ()) { -#if 0 - /* Code to debug memory leaks. Cannot call from within .ly - since then we get the protects from the parser state too. */ - scm_gc (); - scm_call_0 (ly_scheme_function ("dump-gc-protects")); -#endif - ly_parse_file (scm_makfrom0str (arg)); - first = false; + *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); + tail = SCM_CDRLOC (*tail); } delete option_parser; option_parser = 0; - /* No FILE arguments is now a usage error to help newbies. If you - want a filter, you're not a newbie and should know to use file - argument `-'. */ - if (first) + if (files == SCM_EOL) { + /* No FILE arguments is now a usage error to help newbies. If you + want a filter, you're not a newbie and should know to use file + argument `-'. */ usage (); exit (2); } - if (exit_status_global) - { - printf ("Failed files: "); - for (int i = 0; i < failed_files.size (); i++) - printf ("%s ", failed_files[i].to_str0 ()); - printf ("\n"); - } - exit (exit_status_global); + SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files); + (void) result; + + + /* Unreachable. */ + exit (0); } static void @@ -338,10 +369,25 @@ parse_argv (int argc, char **argv) { bool help_b = false; option_parser = new Getopt_long (argc, argv, options_static); - while (Long_option_init const * opt = (*option_parser) ()) + while (Long_option_init const *opt = (*option_parser) ()) { switch (opt->shortname_char_) { + case 0: + if (String (opt->longname_str0_) == "png") + make_png = true; + else if (String (opt->longname_str0_) == "pdf") + make_pdf = true; + else if (String (opt->longname_str0_) == "ps") + make_ps = true; + else if (String (opt->longname_str0_) == "dvi") + make_dvi = true; + else if (String (opt->longname_str0_) == "tex") + make_tex = true; + else if (String (opt->longname_str0_) == "preview") + make_preview = true; + break; + case 'v': notice (); exit (0); @@ -349,10 +395,8 @@ parse_argv (int argc, char **argv) case 'o': { String s = option_parser->optional_argument_str0_; - Path p = split_path (s); - if (s != "-" && p.ext.is_empty ()) - p.ext = output_format_global; - output_name_global = p.to_string (); + File_name file_name (s); + output_name_global = file_name.to_string (); } break; case 'e': @@ -371,15 +415,12 @@ parse_argv (int argc, char **argv) } output_format_global = option_parser->optional_argument_str0_; break; - case 'P': - dependency_prefix_global = option_parser->optional_argument_str0_; - break; case 'H': dump_header_fieldnames_global .push (option_parser->optional_argument_str0_); break; case 'I': - global_path.push (option_parser->optional_argument_str0_); + global_path.append (option_parser->optional_argument_str0_); break; case 'i': init_name_global = option_parser->optional_argument_str0_; @@ -393,13 +434,15 @@ parse_argv (int argc, char **argv) case 's': safe_global_b = true; break; - case 'M': - dependency_global_b = true; - break; case 'm': - no_paper_global_b = true; + no_layout_global_b = true; + break; + case 'p': + make_preview = true; break; default: + programming_error (to_string ("unhandled short option: %c", + opt->shortname_char_)); assert (false); break; }