improvements to graphing support

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index f640801b84a647ecffec6878d371c6b4a3706915..68fc2a03cb4a4381f4f14f019d88d4e6241194b6 100644 (file)
--- 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"
@@ -89,7 +88,7 @@ bool make_print = true;
 
 
 bool relocate_binary =
-#if ARGV0_RELOCATION
+#if 1
   true;
 #else
   false
@@ -129,7 +128,7 @@ static char const *WARRANTY
       "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU\n"
       "General Public License for more details.\n"
       "\n"
-      "    You should have received a copy (refer to the file COPYING) of the\n"
+      "    You should have received a copy of the\n"
       "GNU General Public License along with this program; if not, write to\n"
       "the Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n"
       "Boston, MA 02111-1307, USA.\n");
@@ -394,8 +393,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 ())
@@ -427,6 +425,7 @@ main_with_guile (void *, int, char **)
       *tail = scm_cons (scm_makfrom0str (arg), SCM_EOL);
       tail = SCM_CDRLOC (*tail);
     }
+  
   delete option_parser;
   option_parser = 0;
 
@@ -540,7 +539,12 @@ parse_argv (int argc, char **argv)
          break;
 
        case 'f':
-         output_format_global = option_parser->optional_argument_str0_;
+         {
+           vector<string> components
+             = string_split (option_parser->optional_argument_str0_, ',');
+           for (vsize i = 0; i < components.size (); i++)
+             add_output_format (components[i]);
+         }
          break;
 
        case 'H':
@@ -596,13 +600,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
@@ -622,6 +632,7 @@ main (int argc, char **argv)
   setup_paths (argv[0]);
   setup_guile_env ();
 
+#if 0
   /* Debugging aid.  */
   try
     {
@@ -631,7 +642,32 @@ main (int argc, char **argv)
     {
       error (_f ("exception caught: %s", e.what ()));
     };
-
+#else
+  scm_boot_guile (argc, argv, main_with_guile, 0);
+#endif
+       
   /* 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;
+}