X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=759091ee11f4adc11b72bde8aeaa26d6d2c94365;hb=4bb694525afcf12565aafee08e49dd4252a6e86c;hp=28f3587f3f198e6570620228cb36182660c85ff0;hpb=76b9a727b454dc2c7d30212f787913b71d756b4c;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 28f3587f3f..759091ee11 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -77,20 +77,7 @@ bool be_verbose_global = false;
 string init_scheme_code_global;
 string init_scheme_variables_global;
 
-/* Generate preview of first system.  */
-bool make_preview = false;
-
-/* Generate printed output.  */
-bool make_print = true;
-
-
-bool relocate_binary =
-#if 1
-  true;
-#else
-  false
-#endif
-  ;
+bool relocate_binary = true;
 
 
 /*
@@ -169,9 +156,7 @@ static Long_option_init options_static[]
   {_i ("USER, GROUP, JAIL, DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n"
 						"and cd into DIR")},
 #endif
-  {0, "no-print", 0, _i ("do not generate printed output")},
   {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
-  {0, "preview", 'p',  _i ("generate a preview of the first system")},
   {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
   {0, "version", 'v',  _i ("show version number and exit")},
   {0, "verbose", 'V', _i ("be verbose")},
@@ -181,6 +166,29 @@ static Long_option_init options_static[]
 
 char const *LILYPOND_DATADIR = PACKAGE_DATADIR "/" TOPLEVEL_VERSION;
 
+
+/* x86 defaults to using 80-bit extended precision arithmetic. This can cause
+   problems because the truncation from 80 bits to 64 bits can occur in
+   unpredictable places. To get around this, we tell the x87 FPU to use only
+   double precision. Note that this is not needed for x86_64 because that uses
+   the SSE unit by default instead of the x87 FPU. */
+#if ((defined(__x86__) || defined(__i386__)) \
+  && defined(HAVE_FPU_CONTROL_H) && (HAVE_FPU_CONTROL_H == 1))
+
+#include <fpu_control.h>
+static void configure_fpu() {
+  fpu_control_t fpu_control = 0x027f;
+  _FPU_SETCW (fpu_control);
+}
+
+#else
+
+static void configure_fpu() {
+}
+
+#endif /* defined(__x86__) || defined(__i386__) */
+
+
 static void
 env_var_info (FILE *out, char const *key)
 {
@@ -232,9 +240,10 @@ static void
 notice ()
 {
   identify (stdout);
-  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
   printf ("\n");
   copyright ();
+  printf ("\n");
+  puts (_f (NOTICE, PROGRAM_NAME).c_str ());
 }
 
 LY_DEFINE (ly_usage, "ly:usage",
@@ -465,10 +474,6 @@ parse_argv (int argc, char **argv)
 	      || string (opt->longname_str0_) == "ps"
 	      || string (opt->longname_str0_) == "tex")
 	    add_output_format (opt->longname_str0_);
-	  else if (string (opt->longname_str0_) == "preview")
-	    make_preview = true;
-	  else if (string (opt->longname_str0_) == "no-pages")
-	    make_print = false;
 	  else if (string (opt->longname_str0_) == "relocate")
 	    relocate_binary = true;
 	  break;
@@ -540,9 +545,6 @@ parse_argv (int argc, char **argv)
 	case 'V':
 	  be_verbose_global = true;
 	  break;
-	case 'p':
-	  make_preview = true;
-	  break;
 	default:
 	  programming_error (to_string ("unhandled short option: %c",
 					opt->shortname_char_));
@@ -556,7 +558,6 @@ parse_argv (int argc, char **argv)
 
   if (show_help)
     {
-      identify (stdout);
       ly_usage ();
       if (be_verbose_global)
 	dir_info (stdout);
@@ -586,9 +587,16 @@ setup_guile_env ()
 	       "104857600", overwrite);
 }
 
+vector<string> start_environment_global;
+ 
 int
-main (int argc, char **argv)
+main (int argc, char **argv, char **envp)
 {
+  configure_fpu();
+
+  for (char **p = envp; *p; p++)
+    start_environment_global.push_back(*p);
+  
   if (getenv ("LILYPOND_VERBOSE"))
     be_verbose_global = true;