Uniformize, internalize.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index d89bfcd1eaf9c4693e6b67386aa4462a63dbb820..e5b6ef1f7a3d2c6be6b4dde7c15e036a63fa8378 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -86,10 +86,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"
@@ -144,7 +144,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
@@ -275,6 +275,10 @@ main_with_guile (void *, int, char **)
   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 += ")";
@@ -380,10 +384,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':