X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=ce313b93d17cc05ec35bdd166dc7e0fe0e3854cb;hb=2a334fabd98bb8aaab153b83f2cd5f37faaf238a;hp=7431bce28df601b951177c7cc1c9351651cb32b3;hpb=32cc6f6a34620a03fd5e73fec21ce441dd253491;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 7431bce28d..ce313b93d1 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,74 +3,66 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include -#include -#include -#include -#include +#include "main.hh" + +#include +#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 "getopt-long.hh" -#include "misc.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" +#include "lily-guile.hh" +#include "lily-version.hh" +#include "misc.hh" +#include "output-def.hh" +#include "warn.hh" +#include "freetype.hh" /* * 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; - /* Selected output format. - One of tex, ps, scm, as. */ -String output_format_global = "tex"; + One of tex, ps, scm, as. +*/ +String output_backend_global = "ps"; +String output_format_global = "pdf"; +bool is_pango_format_global; /* Current output name. */ String output_name_global; /* Run in safe mode? */ -bool safe_global_b = false; +bool be_safe_global = false; /* Verbose progress indication? */ -bool verbose_global_b = false; +bool be_verbose_global = false; /* Scheme code to execute before parsing, after .scm init This is where -e arguments are appended to. */ String init_scheme_code_string = "(begin #t "; +bool make_preview = false; +bool make_pages = true; /* @@ -87,14 +79,14 @@ 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" +_f ("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" - "information.\n"); + "under certain conditions. Invoke as `%s --warranty' for more\n" + "information.\n", "lilypond").to_str0 (); static char const *WARRANTY = _i (" This program is free software; you can redistribute it and/or\n" @@ -115,7 +107,7 @@ _i (" This program is free software; you can redistribute it and/or\n" /* Where the init files live. Typically: LILYPOND_DATADIR = /usr/share/lilypond LOCAL_LILYPOND_DATADIR = /usr/share/lilypond/ */ -char const *prefix_directory[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; +char const *prefix_directories[] = {LILYPOND_DATADIR, LOCAL_LILYPOND_DATADIR, 0}; /* The option parser */ static Getopt_long *option_parser = 0; @@ -126,36 +118,41 @@ static Getopt_long *option_parser = 0; static Long_option_init options_static[] = { + {_i ("EXT"), "backend", 'b', _i ("select backend to use")}, {_i ("EXPR"), "evaluate", 'e', - _i ("set options, use -e '(ly-option-usage)' for help")}, - /* Bug in option parser: --output=foe is taken as an abbreviation + _i ("set option, 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 ("EXTs"), "formats", 'f', _i ("list of formats to dump")}, {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")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, - {_i ("DIR"), "dep-prefix", 'P', _i ("prepend DIR to dependencies")}, + {_i ("FILE"), "output", 'o', _i ("write output to FILE (suffix will be added)")}, + {0, "preview", 'p', _i ("generate a preview")}, + {0, "no-pages", 0, _i ("don't generate full pages")}, + {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")}, {0, "warranty", 'w', _i ("show warranty and copyright")}, - {0,0,0,0} + {0, 0, 0, 0} }; 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 : "")); } @@ -163,7 +160,7 @@ static void copyright () { printf (_f ("Copyright (c) %s by\n%s and others.", - "1996--2004", + "1996--2005", AUTHORS).to_str0 ()); printf ("\n"); } @@ -172,13 +169,13 @@ static void identify (FILE *out) { fputs (gnu_lilypond_version_string ().to_str0 (), out); + fputs ("\n", out); } static void notice () { identify (stdout); - printf ("\n"); printf (_f (NOTICE, PROGRAM_NAME).to_str0 ()); printf ("\n"); copyright (); @@ -188,7 +185,7 @@ static void usage () { /* No version number or newline here. It confuses help2man. */ - printf (_f ("Usage: %s [OPTIONS]... FILE...", PROGRAM_NAME).to_str0 ()); + printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ()); printf ("\n\n"); printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ()); printf ("\n\n"); @@ -219,24 +216,25 @@ static void setup_paths () { if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directory[1] = lilypond_prefix; + prefix_directories[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 */ - char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0}; + char *suffixes[] = {"ly", "cff", "otf", "mf/out", "scm", "tfm", "ps", "svg", + 0}; - for (unsigned i = 0; prefix_directory[i]; i++) + for (unsigned i = 0; prefix_directories[i]; i++) for (char **s = suffixes; *s; s++) { - String p = prefix_directory[i] + to_string ('/') + String (*s); + String p = prefix_directories[i] + to_string ('/') + String (*s); global_path.prepend (p); #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 } @@ -249,25 +247,33 @@ prepend_load_path (String dir) scm_c_eval_string (s.to_str0 ()); } +void init_global_tweak_registry (); +void init_fontconfig (); + + static void main_with_guile (void *, int, char **) { /* Engravers use lily.scm contents, need to make Guile find it. Prepend onto GUILE %load-path, very ugh. */ - for (unsigned i = 0; prefix_directory[i]; i++) + for (unsigned i = 0; prefix_directories[i]; i++) { - prepend_load_path (prefix_directory[i]); + prepend_load_path (prefix_directories[i]); /* Junk this. We should make real modules iso. just loading files. */ - prepend_load_path (String (prefix_directory[i]) + "/scm"); + prepend_load_path (String (prefix_directories[i]) + "/scm"); } - - if (verbose_global_b) + if (be_verbose_global) dir_info (stderr); ly_c_init_guile (); call_constructors (); - progress_indication ("\n"); + init_global_tweak_registry (); + init_fontconfig (); + init_freetype (); + + is_pango_format_global = (output_backend_global != "tex" + && output_backend_global != "texstr"); all_fonts_global = new All_font_metrics (global_path.to_string ()); @@ -280,11 +286,10 @@ main_with_guile (void *, int, char **) SCM files = SCM_EOL; SCM *tail = &files; - bool first = true; while (char const *arg = option_parser->get_next_arg ()) { *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL); - tail = SCM_CDRLOC(*tail); + tail = SCM_CDRLOC (*tail); } delete option_parser; option_parser = 0; @@ -292,19 +297,17 @@ main_with_guile (void *, int, char **) 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 `-'. */ + want a filter, you're not a newbie and should know to use file + argument `-'. */ usage (); exit (2); } - SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), - files); + SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); + (void) result; - /* - unreachable. - */ + /* Unreachable. */ exit (0); } @@ -326,15 +329,39 @@ setup_localisation () #endif } +static void +add_output_format (String format) +{ + if (output_format_global != "") + output_format_global += ","; + output_format_global += format; +} + + static void 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" + || String (opt->longname_str0_) == "pdf" + || String (opt->longname_str0_) == "ps" + || String (opt->longname_str0_) == "dvi" + || String (opt->longname_str0_) == "tex") + { + add_output_format (opt->longname_str0_); + } + else if (String (opt->longname_str0_) == "preview") + make_preview = true; + else if (String (opt->longname_str0_) == "no-pages") + make_pages = false; + break; + case 'v': notice (); exit (0); @@ -342,10 +369,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': @@ -355,24 +380,21 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; + + case 'b': + output_backend_global = option_parser->optional_argument_str0_; + break; + case 'f': - if (option_parser->optional_argument_str0_ == "help") - { - printf (_ ("This option is for developers only.").to_str0 ()); - printf (_ ("Read the sources for more information.").to_str0 ()); - exit (0); - } 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_; @@ -381,18 +403,17 @@ parse_argv (int argc, char **argv) help_b = true; break; case 'V': - verbose_global_b = true; + be_verbose_global = true; break; case 's': - safe_global_b = true; + be_safe_global = true; break; - case 'M': - dependency_global_b = true; - break; - case 'm': - no_paper_global_b = true; + case 'p': + make_preview = true; break; default: + programming_error (to_string ("unhandled short option: %c", + opt->shortname_char_)); assert (false); break; } @@ -400,8 +421,9 @@ parse_argv (int argc, char **argv) if (help_b) { + identify (stdout); usage (); - if (verbose_global_b) + if (be_verbose_global) dir_info (stdout); exit (0); } @@ -410,9 +432,10 @@ parse_argv (int argc, char **argv) int main (int argc, char **argv) { - setup_localisation (); + setup_localisation (); setup_paths (); parse_argv (argc, argv); + identify (stderr); initialize_kpathsea (argv[0]); scm_boot_guile (argc, argv, main_with_guile, 0);