X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=1efd32303b8239b252de73c015080d8c1712b714;hb=1e631c87d1f5c1e5c448c8604e1d2f7b2ff9b5be;hp=415425bef6bccddccaa01ef542bf66e32d9f952a;hpb=c3043e2b9c1c296af86721617f58601e21eccaa8;p=lilypond.git diff --git a/lily/main.cc b/lily/main.cc index 415425bef6..1efd32303b 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -5,7 +5,7 @@ (c) 1997--2005 Han-Wen Nienhuys */ - + #include "main.hh" #include @@ -40,6 +40,7 @@ #include "string-convert.hh" #include "version.hh" #include "warn.hh" +#include "program-option.hh" /* * Global options that can be overridden through command line. @@ -55,7 +56,7 @@ String init_name_global; One of (gnome, ps [default], scm, svg, tex, texstr)") */ String output_backend_global = "ps"; /* Output formats to generate. */ -String output_format_global = "pdf"; +String output_format_global = ""; bool is_pango_format_global; bool is_TeX_format_global; @@ -526,6 +527,9 @@ main_with_guile (void *, int, char **) ly_c_init_guile (); call_constructors (); + ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global)); + + init_global_tweak_registry (); init_fontconfig (); @@ -709,6 +713,9 @@ parse_argv (int argc, char **argv) } } + if (output_format_global == "") + output_format_global = "pdf"; + if (show_help) { identify (stdout);