X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=ce313b93d17cc05ec35bdd166dc7e0fe0e3854cb;hb=2a334fabd98bb8aaab153b83f2cd5f37faaf238a;hp=225779a68b8079961b03e59df80d8de05b03f5cb;hpb=ba9f8c7b737b63c29e1a7f6956c7cec69d1180bb;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 225779a68b..ce313b93d1 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ #include "main.hh" @@ -40,9 +40,6 @@ Array dump_header_fieldnames_global; /* Name of initialisation file. */ String init_name_global; -/* Do not calculate and write layout output? */ -bool skip_layout_global = false; - /* Selected output format. One of tex, ps, scm, as. */ @@ -86,10 +83,10 @@ 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 --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" @@ -110,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; @@ -121,18 +118,17 @@ 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 option, use -e '(ly:option-usage)' for help")}, /* Bug in option parser: --output =foe is taken as an abbreviation for --output-format. */ - {_i ("EXT"), "backend", 'b', _i ("select back-end to use")}, - {_i ("EXTs"), "format", 'f', _i ("list of formats to dump")}, + {_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, "no-layout", 'm', _i ("produce MIDI output only")}, - {_i ("FILE"), "output", 'o', _i ("write output to FILE")}, + {_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")}, @@ -144,7 +140,7 @@ static Long_option_init options_static[] = {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 @@ -164,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"); } @@ -220,18 +216,19 @@ static void setup_paths () { if (char const *lilypond_prefix = getenv ("LILYPONDPREFIX")) - prefix_directory[1] = lilypond_prefix; + prefix_directories[1] = lilypond_prefix; global_path.append (""); /* Adding mf/out make lilypond unchanged source directory, when setting LILYPONDPREFIX to lilypond-x.y.z */ - char *suffixes[] = {"ly", "otf", "mf/out", "scm", "tfm", "ps", "svg", 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 @@ -251,17 +248,19 @@ prepend_load_path (String dir) } 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 (be_verbose_global) @@ -270,7 +269,12 @@ main_with_guile (void *, int, char **) ly_c_init_guile (); call_constructors (); 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 ()); init_scheme_code_string += ")"; @@ -328,9 +332,9 @@ setup_localisation () static void add_output_format (String format) { - if (output_name_global != "") - output_name_global += ","; - output_name_global += format; + if (output_format_global != "") + output_format_global += ","; + output_format_global += format; } @@ -376,10 +380,9 @@ parse_argv (int argc, char **argv) warranty (); exit (0); break; + case 'b': output_backend_global = option_parser->optional_argument_str0_; - is_pango_format_global = (output_backend_global != "tex" - &&output_backend_global != "texstr"); break; case 'f': @@ -405,9 +408,6 @@ parse_argv (int argc, char **argv) case 's': be_safe_global = true; break; - case 'm': - skip_layout_global = true; - break; case 'p': make_preview = true; break;