X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmain.cc;h=5aba63d78d255a480a88ed7cf9e5f777d82901bd;hb=53ae05c0d5993676c674d043c1ca47f20982d711;hp=0e8a1e580dd3aecfaf48ad99a9e14ffd366f0818;hpb=2c8c61b3a5cddbb155786a1ca027528701c91ac9;p=lilypond.git

diff --git a/lily/main.cc b/lily/main.cc
index 0e8a1e580d..5aba63d78d 100644
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -34,7 +34,6 @@ using namespace std;
 #include "getopt-long.hh"
 #include "global-ctor.hh"
 #include "international.hh"
-#include "lily-guile.hh"
 #include "lily-version.hh"
 #include "misc.hh"
 #include "output-def.hh"
@@ -151,24 +150,24 @@ static Getopt_long *option_parser = 0;
 
 static Long_option_init options_static[]
 = {
-  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps,eps,\nscm, svg, tex, texstr)\ndefault: PS")},
+  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (eps, gnome, ps [default],\nscm, svg, tex, texstr)")},
 
-  {_i ("SYM=VAL"), "define-default", 'd',
-   _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
-       "Try -dhelp for help.")},
+  {_i ("SYM[=VAL]"), "define-default", 'd',
+   _i ("set Scheme option SYM to VAL (default: #t)\n"
+       "Use -dhelp for help.")},
 
   {_i ("EXPR"), "evaluate", 'e', _i ("evaluate scheme code")},
   /* Bug in option parser: --output =foe is taken as an abbreviation
      for --output-format.  */
   {_i ("FORMATs"), "formats", 'f', _i ("dump FORMAT,...  Also as separate options:")},
   {0, "dvi", 0, _i ("generate DVI (tex backend only)")},
-  {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
   {0, "pdf", 0, _i ("generate PDF (default)")},
   {0, "png", 0, _i ("generate PNG")},
   {0, "ps", 0, _i ("generate PostScript")},
   {0, "tex", 0, _i ("generate TeX (tex backend only)")},
-  {0, "help", 'h',  _i ("print this help")},
-  {_i ("FIELD"), "header", 'H',  _i ("dump a header field to file BASENAME.FIELD")},
+  {0, "help", 'h',  _i ("show this help and exit")},
+  {_i ("FIELD"), "header", 'H',  _i ("dump header field FIELD to file\n"
+				     "named BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
 #if HAVE_CHROOT
@@ -178,8 +177,10 @@ static Long_option_init options_static[]
   {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, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript operations")},
-  {0, "version", 'v',  _i ("print version number")},
+  {0, "relocate", 0, _i ("relocate using directory of lilypond program")},
+  {0, "safe-mode", 's',  _i ("disallow unsafe Scheme and PostScript\n"
+			     "operations")},
+  {0, "version", 'v',  _i ("show version number and exit")},
   {0, "verbose", 'V', _i ("be verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
   {0, 0, 0, 0}
@@ -321,7 +322,7 @@ do_chroot_jail ()
       if (errno == 0)
 	error (_f ("no such user: %s", components[USER_NAME]));
       else
-	error (_f ("can't get user id from user name: %s: %s",
+	error (_f ("cannot get user id from user name: %s: %s",
 		   components[USER_NAME],
 		   strerror (errno)));
       exit (3);
@@ -338,7 +339,7 @@ do_chroot_jail ()
       if (errno == 0)
 	error (_f ("no such group: %s", components[GROUP_NAME]));
       else
-	error (_f ("can't get group id from group name: %s: %s",
+	error (_f ("cannot get group id from group name: %s: %s",
 		   components[GROUP_NAME],
 		   strerror (errno)));
       exit (3);
@@ -346,26 +347,26 @@ do_chroot_jail ()
 
   if (chroot (components[JAIL].c_str ()))
     {
-      error (_f ("can't chroot to: %s: %s", components[JAIL],
+      error (_f ("cannot chroot to: %s: %s", components[JAIL],
 		 strerror (errno)));
       exit (3);
     }
 
   if (setgid (gid))
     {
-      error (_f ("can't change group id to: %d: %s", gid, strerror (errno)));
+      error (_f ("cannot change group id to: %d: %s", gid, strerror (errno)));
       exit (3);
     }
 
   if (setuid (uid))
     {
-      error (_f ("can't change user id to: %d: %s", uid, strerror (errno)));
+      error (_f ("cannot change user id to: %d: %s", uid, strerror (errno)));
       exit (3);
     }
 
   if (chdir (components[DIR].c_str ()))
     {
-      error (_f ("can't change working directory to: %s: %s", components[DIR],
+      error (_f ("cannot change working directory to: %s: %s", components[DIR],
 		 strerror (errno)));
       exit (3);
     }
@@ -394,8 +395,7 @@ main_with_guile (void *, int, char **)
   init_fontconfig ();
 
   init_freetype ();
-
-  all_fonts_global = new All_font_metrics (global_path.to_string ());
+  ly_reset_all_fonts ();
 
   if (!init_scheme_variables.empty ()
       || !init_scheme_code_string.empty ())
@@ -602,13 +602,19 @@ setup_guile_env ()
   bool overwrite = true;
   if (!yield)
     {
-      yield = "70";
+      yield = "65";
       overwrite = false;
     }
 
   sane_putenv ("GUILE_MIN_YIELD_1", yield, overwrite);
   sane_putenv ("GUILE_MIN_YIELD_2", yield, overwrite);
   sane_putenv ("GUILE_MIN_YIELD_MALLOC", yield, overwrite);
+
+
+  sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1",
+	       "10485760", overwrite);
+  sane_putenv ("GUILE_MAX_SEGMENT_SIZE",
+	       "104857600", overwrite);
 }
 
 void