Fix 449.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index fd61dbb8c6c49be9779c28eeee0dccb0c5dc9aeb..3c0f7ae88eb7a4f28a065d1555ff4ffcf9c07aa9 100644 (file)
--- 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")},
@@ -465,10 +450,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 +521,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_));
@@ -586,9 +564,14 @@ setup_guile_env ()
               "104857600", overwrite);
 }
 
+vector<string> start_environment_global;
+ 
 int
-main (int argc, char **argv)
+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;
 
@@ -617,25 +600,3 @@ main (int argc, char **argv)
   /* Only reachable if GUILE exits.  That is an error.  */
   return 1;
 }
-
-SCM atexit_list = SCM_EOL;
-
-LY_DEFINE (ly_atexit, "ly:atexit",
-          2, 0, 0, (SCM proc, SCM args),
-          "Just before exiting, call the procedure given. "
-"If this is called multiple times, the procedures are called "
-"in LIFO order.")
-{
-  atexit_list = scm_cons (scm_cons (proc, args), atexit_list);
-  scm_gc_protect_object (atexit_list);
-  return SCM_UNSPECIFIED;
-}
-
-LY_DEFINE (ly_do_atexit, "ly:do-atexit",
-          0, 0, 0, (),
-          "Call the atexit procedures.")
-{
-  for (SCM s = atexit_list; scm_is_pair (s); s = scm_cdr (s))
-    scm_apply_0 (scm_caar (s), scm_cdar (s));
-  return SCM_UNSPECIFIED;
-}