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

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index edd9ba013e4e2036482d37a4bed83bf85dcdcdbe..8cca9aa0e3281e14e818630243dcbd1efd16ec96 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -6,11 +6,11 @@
   (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-#include <locale.h>
-#include <string.h>
+#include "main.hh"
+
+#include <cassert>
+#include <clocale>
+#include <cstring>
 
 #include "config.hh"
 
@@ -20,17 +20,15 @@
 
 #include "all-font-metrics.hh"
 #include "file-name.hh"
-#include "file-path.hh"
 #include "getopt-long.hh"
 #include "global-ctor.hh"
 #include "kpath.hh"
 #include "lily-guile.hh"
 #include "lily-version.hh"
-#include "main.hh"
 #include "misc.hh"
 #include "output-def.hh"
-#include "string.hh"
 #include "warn.hh"
+#include "freetype.hh"
 
 /*
  * Global options that can be overridden through command line.
@@ -46,7 +44,8 @@ String init_name_global;
 bool no_layout_global_b = false;
 
 /* Selected output format.
-   One of tex, ps, scm, as. */
+   One of tex, ps, scm, as.
+*/
 String output_format_global = "tex";
 
 /* Current output name. */
@@ -126,7 +125,7 @@ static Long_option_init options_static[] =
   {
     {_i ("EXPR"), "evaluate", 'e',
      _i ("set option, use -e '(ly:option-usage)' for help")},
-    /* Bug in option parser: --output=foe is taken as an abbreviation
+    /* Bug in option parser: --output =foe is taken as an abbreviation
        for --output-format.  */
     {_i ("EXT"), "format", 'f', _i ("select back-end to use")},
     {0, "help", 'h',  _i ("print this help")},
@@ -153,12 +152,12 @@ static void
 dir_info (FILE *out)
 {
   fputs ("\n", out);
-  fprintf (out, "LILYPOND_DATADIR=\"%s\"\n", LILYPOND_DATADIR);
-  fprintf (out, "LOCAL_LILYPOND_DATADIR=\"\%s\"\n", LOCAL_LILYPOND_DATADIR);
-  fprintf (out, "LOCALEDIR=\"%s\"\n", LOCALEDIR);
+  fprintf (out, "LILYPOND_DATADIR =\"%s\"\n", LILYPOND_DATADIR);
+  fprintf (out, "LOCAL_LILYPOND_DATADIR =\"\%s\"\n", LOCAL_LILYPOND_DATADIR);
+  fprintf (out, "LOCALEDIR =\"%s\"\n", LOCALEDIR);
 
   char *lilypond_prefix = getenv ("LILYPONDPREFIX");
-  fprintf (out, "LILYPONDPREFIX=\"%s\"\n",
+  fprintf (out, "LILYPONDPREFIX =\"%s\"\n",
           (lilypond_prefix ? lilypond_prefix : ""));
 }
 
@@ -175,13 +174,13 @@ static void
 identify (FILE *out)
 {
   fputs (gnu_lilypond_version_string ().to_str0 (), out);
+  fputs ("\n", out);
 }
  
 static void
 notice ()
 {
   identify (stdout);
-  printf ("\n");
   printf (_f (NOTICE, PROGRAM_NAME).to_str0 ());
   printf ("\n");
   copyright ();
@@ -228,7 +227,7 @@ setup_paths ()
 
   /* Adding mf/out make lilypond unchanged source directory, when setting
      LILYPONDPREFIX to lilypond-x.y.z */
-  char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0};
+  char *suffixes[] = {"ly", "otf", "mf/out", "scm", "tfm", "ps", "svg", 0};
 
   for (unsigned i = 0; prefix_directory[i]; i++)
     for (char **s = suffixes; *s; s++)
@@ -255,15 +254,11 @@ prepend_load_path (String dir)
 static void
 determine_output_options ()
 {
-  
-  bool found_tex = false;
-  SCM formats = ly_output_formats ();
-  for (SCM s = formats; scm_is_pair (s); s = scm_cdr (s)) 
-    {
-      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)
     {
       make_ps = true;
@@ -276,11 +271,13 @@ determine_output_options ()
     {
       make_tex = true;
     }
-  if (!(make_dvi
-       || make_tex
-       || make_ps
-       || make_png
-       || make_pdf))
+  if (!found_gnome
+      && !found_svg
+      && !(make_dvi
+          || make_tex
+          || make_ps
+          || make_png
+          || make_pdf))
     {
       make_pdf = true;
       make_ps = true;
@@ -292,6 +289,8 @@ determine_output_options ()
     }
 }
 
+void init_global_tweak_registry ();
+
 static void
 main_with_guile (void *, int, char **)
 {
@@ -309,8 +308,8 @@ main_with_guile (void *, int, char **)
 
   ly_c_init_guile ();
   call_constructors ();
-  progress_indication ("\n");
-
+  init_global_tweak_registry ();
+  init_freetype ();
   determine_output_options ();  
   all_fonts_global = new All_font_metrics (global_path.to_string ());
 
@@ -340,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;
 
 
@@ -454,6 +453,7 @@ parse_argv (int argc, char **argv)
 
   if (help_b)
     {
+      identify (stdout);
       usage ();
       if (verbose_global_b)
        dir_info (stdout);
@@ -464,9 +464,10 @@ parse_argv (int argc, char **argv)
 int
 main (int argc, char **argv)
 {
-  setup_localisation ();  
+  setup_localisation ();
   setup_paths ();
   parse_argv (argc, argv);
+  identify (stderr);
   initialize_kpathsea (argv[0]);
 
   scm_boot_guile (argc, argv, main_with_guile, 0);