* lily/GNUmakefile (MODULE_INCLUDES): remove ttftool

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index f8b0343eeffb7923f279884242af564eb369bc58..1efd32303b8239b252de73c015080d8c1712b714 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -5,7 +5,7 @@
 
   (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
-
+ 
 #include "main.hh"
 
 #include <cassert>
@@ -40,6 +40,7 @@
 #include "string-convert.hh"
 #include "version.hh"
 #include "warn.hh"
+#include "program-option.hh"
 
 /*
  * Global options that can be overridden through command line.
@@ -55,7 +56,7 @@ String init_name_global;
    One of (gnome, ps [default], scm, svg, tex, texstr)") */
 String output_backend_global = "ps";
 /* Output formats to generate.  */
-String output_format_global = "pdf";
+String output_format_global = "";
 
 bool is_pango_format_global;
 bool is_TeX_format_global;
@@ -137,12 +138,13 @@ static Getopt_long *option_parser = 0;
 
 static Long_option_init options_static[]
 = {
-  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\n                                       scm, svg, tex, texstr)")},
+  {_i ("BACK"), "backend", 'b', _i ("use backend BACK (gnome, ps [default],\nscm, svg, tex, texstr)")},
 
   {_i ("SYM=VAL"), "define-default", 'd',
-   _i ("define a default Scheme setting.")},
+   _i ("set a Scheme program option. Uses #t if VAL is not specified\n"
+       "Try -dhelp for help.")},
 
-  {_i ("EXPR"), "evaluate", 'e', _i ("set scheme option, for help use\n                                       -e '(ly:option-usage)'")},
+  {_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:")},
@@ -157,7 +159,8 @@ static Long_option_init options_static[]
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
   {_i ("FILE"), "output", 'o',  _i ("write output to FILE (suffix will be added)")},
 #if HAVE_CHROOT
-  {_i ("USER,GROUP,JAIL,DIR"), "jail", 'j', _i ("chroot to JAIL, become USER:GROUP\n                                       and cd into DIR")},
+  {_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")},
   {0, "preview", 'p',  _i ("generate a preview of the first system")},
@@ -282,10 +285,12 @@ set_env_file (char const* key, String value)
 static int
 prepend_env_path (char const *key, String value)
 {
-  if (char const* cur = getenv (key))
-    value += to_string (PATHSEP) + cur;
-  if (is_dir (value + "/"))
-    return sane_putenv (key, value.to_str0 ());
+  if (is_dir (value))
+    {
+      if (char const* cur = getenv (key))
+       value += to_string (PATHSEP) + cur;
+      return sane_putenv (key, value.to_str0 ());
+    }
   else if (be_verbose_global)
     warning (_f ("no such directory: %s", value));
   return -1;
@@ -324,7 +329,7 @@ setup_paths (char const* argv0)
                     prefix_directory));
       String datadir = argv0_prefix + "/share";
       String libdir = argv0_prefix + "/lib";
-      String localedir = argv0_prefix + "/locale";
+      String localedir = datadir + "/locale";
       String sysconfdir = argv0_prefix + "/etc";
       String argv0_lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION;
 
@@ -522,6 +527,9 @@ main_with_guile (void *, int, char **)
 
   ly_c_init_guile ();
   call_constructors ();
+  ly_set_option (ly_symbol2scm ("verbose"), scm_from_bool (be_verbose_global));
+
+  
   init_global_tweak_registry ();
   init_fontconfig ();
 
@@ -533,7 +541,7 @@ main_with_guile (void *, int, char **)
   if (!init_scheme_variables.is_empty ()
       || !init_scheme_code_string.is_empty ())
     {
-      init_scheme_variables = "(ly:set-option 'command-line-settings (list "
+      init_scheme_variables = "(map (lambda (x) (ly:set-option (car x) (cdr x))) (list "
        + init_scheme_variables + "))";
       
       init_scheme_code_string
@@ -705,6 +713,9 @@ parse_argv (int argc, char **argv)
        }
     }
 
+  if (output_format_global == "")
+    output_format_global = "pdf";
+      
   if (show_help)
     {
       identify (stdout);