resolve merge

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 2d293343c5662cc7553e21fe65c7e9dc4884f059..9e33ec13dcdd56139db961355b9ab6885daf4962 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -1,9 +1,20 @@
 /*
-  main.cc -- implement main () entrypoint.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "main.hh"
@@ -102,8 +113,9 @@ static char const *NOTICE
 
 static char const *WARRANTY
 = _i ("    This program is free software; you can redistribute it and/or\n"
-      "modify it under the terms of the GNU General Public License version 2\n"
-      "as published by the Free Software Foundation.\n"
+      "modify it under the terms of the GNU General Public License as \n"
+      "published by the Free Software Foundation, either version 3 of\n"
+      "the License, or (at your option) any later version.\n"
       "\n"
       "    This program is distributed in the hope that it will be useful,\n"
       "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
@@ -128,7 +140,7 @@ static Getopt_long *option_parser = 0;
 
 /* Internationalisation kludge in two steps:
  * use _i () to get entry in POT file
- * call gettext () explicitely for actual "translation"  */
+ * call gettext () explicitly for actual "translation"  */
 
 static Long_option_init options_static[]
 = {
@@ -172,14 +184,18 @@ char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
   && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1))
 
 #include <fpu_control.h>
-static void configure_fpu() {
+static void
+configure_fpu ()
+{
   fpu_control_t fpu_control = 0x027f;
   _FPU_SETCW (fpu_control);
 }
 
 #else
 
-static void configure_fpu() {
+static void
+configure_fpu ()
+{
 }
 
 #endif /* defined(__x86__) || defined(__i386__) */
@@ -219,9 +235,9 @@ dir_info (FILE *out)
 static void
 copyright ()
 {
-  /* Do not update the copyright years here, run grand-replace.sh.  */
-  printf (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
-             AUTHORS).c_str ());
+  /* Do not update the copyright years here, run `make grand-replace'  */
+  printf ("%s", (_f ("Copyright (c) %s by\n%s  and others.", "1996--2011",
+                     AUTHORS).c_str ()));
   printf ("\n");
 }
 
@@ -247,25 +263,25 @@ LY_DEFINE (ly_usage, "ly:usage",
           "Print usage message.")
 {
   /* No version number or newline here.  It confuses help2man.  */
-  printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ());
+  printf ("%s", (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ()));
   printf ("\n\n");
-  printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ());
+  printf ("%s", (_ ("Typeset music and/or produce MIDI from FILE.").c_str ()));
   printf ("\n\n");
-  printf (_ ("LilyPond produces beautiful music notation.").c_str ());
+  printf ("%s", (_ ("LilyPond produces beautiful music notation.").c_str ()));
   printf ("\n");
-  printf (_f ("For more information, see %s", PROGRAM_URL).c_str ());
+  printf ("%s", (_f ("For more information, see %s", PROGRAM_URL).c_str ()));
   printf ("\n\n");
-  printf (_ ("Options:").c_str ());
+  printf ("%s", (_ ("Options:").c_str ()));
   printf ("\n");
-  printf (Long_option_init::table_string (options_static).c_str ());
+  printf ("%s", Long_option_init::table_string (options_static).c_str ());
   printf ("\n");
   /* Translators, please translate this string as
-         "Report bugs in English via %s",
+     "Report bugs in English via %s",
      or if there is a LilyPond users list or forum in your language
-         "Report bugs in English via %s or in YOUR_LANG via URI"  */
-  printf (_f ("Report bugs via %s",
-             "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
-             ).c_str ());
+     "Report bugs in English via %s or in YOUR_LANG via URI"  */
+  printf ("%s", (_f ("Report bugs via %s",
+                    "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
+                    ).c_str ()));
   printf ("\n");
   printf ("\n");
   return SCM_UNSPECIFIED;
@@ -278,7 +294,7 @@ warranty ()
   printf ("\n");
   copyright ();
   printf ("\n");
-  printf (_ (WARRANTY).c_str ());
+  printf ("%s", (_ (WARRANTY).c_str ()));
 }
 
 static void
@@ -409,7 +425,7 @@ main_with_guile (void *, int, char **)
       *tail = scm_cons (scm_from_locale_string (arg), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
-  
+
   delete option_parser;
   option_parser = 0;
 
@@ -504,9 +520,10 @@ parse_argv (int argc, char **argv)
        case 'j':
          jail_spec = option_parser->optional_argument_str0_;
          break;
-         
+
        case 'e':
-         init_scheme_code_global += option_parser->optional_argument_str0_ + string (" ");
+         init_scheme_code_global
+            += option_parser->optional_argument_str0_ + string (" ");
          break;
        case 'w':
          warranty ();
@@ -561,7 +578,7 @@ parse_argv (int argc, char **argv)
 void
 setup_guile_env ()
 {
-  const char *yield = getenv ("LILYPOND_GC_YIELD");
+  char const *yield = getenv ("LILYPOND_GC_YIELD");
   bool overwrite = true;
   if (!yield)
     {
@@ -581,7 +598,7 @@ setup_guile_env ()
 }
 
 vector<string> start_environment_global;
- 
+
 int
 main (int argc, char **argv, char **envp)
 {
@@ -589,7 +606,7 @@ main (int argc, char **argv, char **envp)
 
   for (char **p = envp; *p; p++)
     start_environment_global.push_back(*p);
-  
+
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;
 
@@ -614,7 +631,7 @@ main (int argc, char **argv, char **envp)
 #else
   scm_boot_guile (argc, argv, main_with_guile, 0);
 #endif
-       
+
   /* Only reachable if GUILE exits.  That is an error.  */
   return 1;
 }