* scripts/lilypond-invoke-editor.scm (dissect-uri): Handle URIs

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index dfc986ceb444d80362198ea4065322872405828e..eb2f222d174a76227600f01958ad6fe294b6432e 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -13,13 +13,17 @@
 #include <cstring>
 #include <unistd.h>
 #include <errno.h>
-#include <pwd.h>
-#include <grp.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #include "config.hh"
 
+#if HAVE_GRP_H
+#include <grp.h>
+#endif 
+#if HAVE_PWD_H
+#include <pwd.h>
+#endif 
 #if HAVE_GETTEXT
 #include <libintl.h>
 #endif
@@ -70,7 +74,8 @@ bool be_verbose_global = false;
 
 /* Scheme code to execute before parsing, after .scm init.
    This is where -e arguments are appended to.  */
-String init_scheme_code_string = "(begin #t ";
+String init_scheme_code_string;
+String init_scheme_variables;
 
 /* Generate preview of first system.  */
 bool make_preview = false;
@@ -147,11 +152,13 @@ static Long_option_init options_static[]
   {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 ("write header field to BASENAME.FIELD")},
+  {_i ("FIELD"), "header", 'H',  _i ("dump a header field to file BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_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")},
+#endif 
   {0, "no-print", 0, _i ("do not generate printed output")},
   {0, "preview", 'p',  _i ("generate a preview of the first system")},
   {0, "safe-mode", 's',  _i ("run in safe mode")},
@@ -200,8 +207,9 @@ notice ()
   copyright ();
 }
 
-static void
-usage ()
+LY_DEFINE (ly_usage, "ly:usage",
+          0, 0, 0, (),
+          "Print usage message.")
 {
   /* No version number or newline here.  It confuses help2man.  */
   printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).to_str0 ());
@@ -219,6 +227,7 @@ usage ()
   printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ());
   printf ("\n");
   printf ("\n");
+  return SCM_UNSPECIFIED;
 }
 
 static void
@@ -283,6 +292,7 @@ prepend_load_path (String dir)
 void init_global_tweak_registry ();
 void init_fontconfig ();
 
+#if HAVE_CHROOT
 static void
 do_chroot_jail ()
 {
@@ -365,8 +375,9 @@ do_chroot_jail ()
       exit (3);
     }
 }
+#endif
+
 
-void test_pango ();
 
 static void
 main_with_guile (void *, int, char **)
@@ -393,9 +404,29 @@ main_with_guile (void *, int, char **)
 
   all_fonts_global = new All_font_metrics (global_path.to_string ());
 
-  init_scheme_code_string += ")";
-  scm_c_eval_string ((char *) init_scheme_code_string.to_str0 ());
+  
+  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 + "))";
+      
+      init_scheme_code_string
+       += "(begin #t "
+       + init_scheme_variables
+       + init_scheme_code_string
+       + ")";
+
+      char const *str0 = init_scheme_code_string.to_str0 ();
+      
+      if (be_verbose_global)
+       {
+         progress_indication (_f("Evaluating %s", str0));
+       }
+      scm_c_eval_string ((char *) str0);
+    }
 
+  
   /* We accept multiple independent music files on the command line to
      reduce compile time when processing lots of small files.
      Starting the GUILE engine is very time consuming.  */
@@ -410,17 +441,10 @@ main_with_guile (void *, int, char **)
   delete option_parser;
   option_parser = 0;
 
-  if (files == SCM_EOL)
-    {
-      /* No FILE arguments is now a usage error to help newbies.  If you
-        want a filter, you're not a newbie and should know to use file
-        argument `-'.  */
-      usage ();
-      exit (2);
-    }
-
-  if (! jail_spec.is_empty ())
+#if HAVE_CHROOT
+  if (!jail_spec.is_empty ())
     do_chroot_jail ();
+#endif
 
   SCM result = scm_call_1 (ly_lily_module_constant ("lilypond-main"), files);
   (void) result;
@@ -478,7 +502,22 @@ parse_argv (int argc, char **argv)
          break;
 
        case 'd':
-         
+         {
+           String arg (option_parser->optional_argument_str0_);
+           int eq = arg.index ('=');
+
+           String key = arg;
+           String val = "#t";
+           
+           if (eq >= 0)
+             {
+               key = arg.left_string (eq);
+               val = arg.right_string (arg.length () - eq - 1);
+             }
+
+           init_scheme_variables
+             += "(cons \'" + key  + "  " + val + ")\n";
+         }
          break;
          
        case 'v':
@@ -544,23 +583,30 @@ parse_argv (int argc, char **argv)
   if (show_help)
     {
       identify (stdout);
-      usage ();
+      ly_usage ();
       if (be_verbose_global)
        dir_info (stdout);
       exit (0);
     }
 }
 
+#ifdef __MINGW32__
+/* If no TTY and not using safe, assume running from GUI.
+   For mingw, the test must be inverted.  */
+#  define isatty(x) (!isatty (x))
+#endif
+
 int
 main (int argc, char **argv)
 {
   setup_localisation ();
   setup_paths ();
   parse_argv (argc, argv);
-  identify (stderr);
+  if (isatty (STDIN_FILENO))
+    identify (stderr);
 
   scm_boot_guile (argc, argv, main_with_guile, 0);
 
-  /* Unreachable */
-  return 0;
+  /* Only reachable if GUILE exits.  That is an error.  */
+  return 1;
 }