X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmain.cc;h=3c0f7ae88eb7a4f28a065d1555ff4ffcf9c07aa9;hb=3dd560c0c440c9e97730ca13f6d5abbb020bb02e;hp=4a539e0eea359ff68e26239ff51d7d04e253eddc;hpb=cbb205d40a19c0d2d9801031a63607e108a18038;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 4a539e0eea..3c0f7ae88e 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -53,9 +53,6 @@ vector<string> dump_header_fieldnames_global;
 /* Name of initialisation file. */
 string init_name_global;
 
-/* Selected output backend
-   One of (gnome, ps [default], eps, scm, svg, tex, texstr)") */
-string output_backend_global = "ps";
 
 /* Output formats to generate.  */
 string output_format_global = "";
@@ -80,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;
 
 
 /*
@@ -136,7 +120,7 @@ static char const *WARRANTY
 /* Where the init files live.  Typically:
    LILYPOND_DATADIR = /usr/share/lilypond
 */
-string prefix_directory;
+string lilypond_datadir;
 
 /* The jail specification: USER, GROUP, JAIL, DIR. */
 string jail_spec;
@@ -150,8 +134,6 @@ static Getopt_long *option_parser = 0;
 
 static Long_option_init options_static[]
 = {
-  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (eps, gnome, ps [default],\nscm, svg, tex, texstr)")},
-
   {_i ("SYM[=VAL]"), "define-default", 'd',
    _i ("set Scheme option SYM to VAL (default: #t).\n"
        "Use -dhelp for help.")},
@@ -174,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")},
@@ -199,9 +179,10 @@ dir_info (FILE *out)
   fputs ("\n", out);
   fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR);
   env_var_info (out, "LILYPONDPREFIX");
+  env_var_info (out, "LILYPOND_DATADIR");
   fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR);
 
-  fprintf (out, "\nEffective prefix: \"%s\"\n", prefix_directory.c_str ());
+  fprintf (out, "\nEffective prefix: \"%s\"\n", lilypond_datadir.c_str ());
 
   if (relocate_binary)
     {
@@ -377,13 +358,11 @@ main_with_guile (void *, int, char **)
   /* Engravers use lily.scm contents, need to make Guile find it.
      Prepend onto GUILE %load-path, very ugh. */
 
-  prepend_load_path (prefix_directory);
-  prepend_load_path (prefix_directory + "/scm");
+  prepend_load_path (lilypond_datadir);
+  prepend_load_path (lilypond_datadir + "/scm");
 
   if (be_verbose_global)
     dir_info (stderr);
-  is_TeX_format_global = (output_backend_global == "tex"
-			  || output_backend_global == "texstr");
 
   is_pango_format_global = !is_TeX_format_global;
   init_scheme_variables_global = "(list " + init_scheme_variables_global + ")";
@@ -396,6 +375,9 @@ main_with_guile (void *, int, char **)
   init_freetype ();
   ly_reset_all_fonts ();
 
+  is_TeX_format_global = (get_output_backend_name () == "tex"
+			  || get_output_backend_name () == "texstr");
+  
 
   /* We accept multiple independent music files on the command line to
      reduce compile time when processing lots of small files.
@@ -468,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;
@@ -491,7 +469,7 @@ parse_argv (int argc, char **argv)
 	      }
 
 	    init_scheme_variables_global
-	      += "(cons \'" + key + "  " + val + ")\n";
+	      += "(cons \'" + key + " '" + val + ")\n";
 	  }
 	  break;
 
@@ -518,10 +496,6 @@ parse_argv (int argc, char **argv)
 	  exit (0);
 	  break;
 
-	case 'b':
-	  output_backend_global = option_parser->optional_argument_str0_;
-	  break;
-
 	case 'f':
 	  {
 	    vector<string> components
@@ -547,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_));
@@ -593,12 +564,14 @@ setup_guile_env ()
 	       "104857600", overwrite);
 }
 
-void
-read_relocation_dir (string);
-
+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;