X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=d84f90ebd8ab55c85395adbdd6b750bb0d334f19;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=93b784f0ffcc296015357e2101989b49c9fe63ee;hpb=c054eb280fd9953596eb164f67b0f9d5555c5a32;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 93b784f0ff..d84f90ebd8 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -55,6 +55,7 @@ using namespace std; #include "string-convert.hh" #include "version.hh" #include "warn.hh" +#include "lily-imports.hh" /* * Global options that can be overridden through command line. @@ -158,6 +159,7 @@ static Long_option_init options_static[] {0, "pdf", 0, _i ("generate PDF (default)")}, {0, "png", 0, _i ("generate PNG")}, {0, "ps", 0, _i ("generate PostScript")}, + {0, "bigpdfs", 'b', _i("generate big PDF files")}, {0, "help", 'h', _i ("show this help and exit")}, { _i ("FIELD"), "header", 'H', _i ("dump header field FIELD to file\n" @@ -479,8 +481,8 @@ main_with_guile (void *, int, char **) // " \"" + lilypond_datadir + "/scm/out\")"; //scm_c_eval_string (scm_pct_set_fallback.c_str() ); scm_primitive_eval - (scm_list_3 (scm_from_locale_symbol ("set!"), - scm_from_locale_symbol ("%compile-fallback-path"), + (scm_list_3 (scm_from_latin1_symbol ("set!"), + scm_from_latin1_symbol ("%compile-fallback-path"), scm_from_locale_string (ly_scm_go_dir.c_str()))); #endif @@ -531,8 +533,8 @@ main_with_guile (void *, int, char **) // SCM result = scm_call_1 ( // scm_variable_ref (call_with_error_handling), // scm_call_1 (ly_lily_module_constant ("lilypond-main"), files)); - SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files); - (void) result; + + Lily::lilypond_main (files); /* Unreachable. */ exit (0); @@ -613,6 +615,10 @@ parse_argv (int argc, char **argv) relocate_binary = true; break; + case 'b': + bigpdfs = true; + break; + case 'd': { string arg (option_parser->optional_argument_str0_);