* lily/modified-font-metric.cc (text_dimension): try

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index fd1ed22fa9da363bb24a18814d1285072017b066..8cca9aa0e3281e14e818630243dcbd1efd16ec96 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -44,8 +44,9 @@ String init_name_global;
 bool no_layout_global_b = false;
 
 /* Selected output format.
-   One of tex, ps, scm, as. */
-String output_format_global = "ps";
+   One of tex, ps, scm, as.
+*/
+String output_format_global = "tex";
 
 /* Current output name. */
 String output_name_global;
@@ -253,16 +254,10 @@ prepend_load_path (String dir)
 static void
 determine_output_options ()
 {
-  bool found_gnome = false;
-  bool found_svg = false;
-  bool found_tex = false;
-  SCM formats = ly_output_formats ();
-  for (SCM s = formats; scm_is_pair (s); s = scm_cdr (s)) 
-    {
-      found_gnome = found_gnome || ly_scm2string(scm_car (s)) == "gnome";
-      found_svg = found_gnome || ly_scm2string(scm_car (s)) == "svg";
-      found_tex = found_tex || (ly_scm2string (scm_car (s)) == "tex");
-    }
+  bool found_gnome = (output_format_global == "gnome");
+  bool found_svg = (output_format_global == "svg");
+  bool found_tex = (output_format_global == "tex");
+
 
   if (make_pdf || make_png)
     {
@@ -344,7 +339,7 @@ main_with_guile (void *, int, char **)
       exit (2);
     }
 
-  SCM result = scm_call_1 (ly_scheme_function ("lilypond-main"), files);
+  SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
   (void) result;