release: 1.5.7

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 0c6ee806b081b4229b9f3e0e5eae177d9a28eba9..1f355bf96162b9e931c7459367ce7192fe95dcbc 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -101,20 +101,23 @@ static Getopt_long *oparser_p_static = 0;
        follow regular localisation guidelines).
  */
 static Long_option_init options_static[] = {
-  {_i ("EXT"), "output-format", 'f',  _i ("use output format EXT (scm, ps, tex or as)")},
+  /* print example usage:  lilypond -e "(set-lily-option 'help 0)" ? */
+  {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
+  /* another bug in option parser: --output=foe is taken as an abbreviation
+     for --output-format */
+  {_i ("EXT"), "format", 'f',  _i ("use output format EXT (scm, ps, tex or as)")},
   {0, "help", 'h',  _i ("this help")},
   {_i ("FIELD"), "header", 'H',  _i ("write header field to BASENAME.FIELD")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
   {0, "dependencies", 'M',  _i ("write Makefile dependencies for every input file")},
-  {_i ("DIR"), "dep-prefix", 'P',  _i ("prepend DIR to dependencies")},
   {0, "no-paper", 'm',  _i ("produce MIDI output only")},
-  {_i ("NAME"), "output", 'o',  _i ("write output to NAME")},
+  {_i ("FILE"), "output", 'o',  _i ("write output to FILE")},
+  {_i ("DIR"), "dep-prefix", 'P',  _i ("prepend DIR to dependencies")},
   {0, "safe", 's',  _i ("inhibit file output naming and exporting")},
   {0, "version", 'v',  _i ("print version number")},
   {0, "verbose", 'V', _i ("verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
-  {_i ("EXPR"), "evaluate", 'e',_i ("evalute EXPR as Scheme after .scm init is read")},
   {0,0,0,0}
 };
 
@@ -131,7 +134,7 @@ usage ()
   /*
     No version number or newline here. It confuses help2man
    */
-  cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond");
+  cout << _f ("Usage: %s [OPTION]... FILE...", "lilypond");
   cout << "\n\n";
   cout << _ ("Typeset music and or play MIDI from FILE");
   cout << "\n\n";
@@ -166,7 +169,7 @@ _ (
 
   cout << endl;
 
-  cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
+  cout << _f ("Report bugs to %s", "bug-lilypond@gnu.org") << endl;
 }
 
 void
@@ -251,10 +254,9 @@ setup_paths ()
     global_path.parse_path (env_sz);
 
 
-  /*
-    Should use kpathsea, this is getting out of hand.  
-   */
-  char *suffixes[] = {"ly", "afm", "scm", "tfm", "ps", 0};
+  /* 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};
   String prefix = prefix_directory;
   if (prefix.empty_b ())
     prefix =  DIR_DATADIR;
@@ -331,20 +333,26 @@ main_prog (int, char**)
   gh_eval_str ((char *)init_scheme_code_string.ch_C());
   
   int p=0;
-  const char *arg ;
-  while ((arg = oparser_p_static->get_next_arg ()) || p == 0)
+  const char *arg  = oparser_p_static->get_next_arg ();
+
+  if (!arg)
     {
-      String infile;
-      
-      if (arg)
-       infile = arg;
-      else
-       infile = "-";
-       
-      // What/when was this supposed to do?
-      // It looks like it reset the outname_str_global for every new
-      // file, but only if user didn't specify a outname?  Huh?
-      // if (outname_str_global == "")
+      usage ();
+      /* No FILE arguments is now a usage error */
+      exit (2);
+    }
+  else
+    do 
+    {
+      String infile (arg);
+       
+      /* What/when was this supposed to do?
+       It looks like it reset the outname_str_global for every new
+       file, but only if user didn't specify a outname?  Huh?
+
+       // if (outname_str_global == "")
+
+      */
       {
        Midi_def::reset_score_count ();
        Paper_def::reset_score_count ();
@@ -380,8 +388,9 @@ main_prog (int, char**)
       output_name_global = save_output_name_global;
       
       p++;
-    }
+    } while ((arg  = oparser_p_static->get_next_arg ()));
   delete oparser_p_static;
+  oparser_p_static = 0;
   exit (exit_status_global);
 }
 
@@ -410,7 +419,8 @@ main (int argc, char **argv)
          export GUILE_MAX_SEGMENT_SIZE=576000
 
      may considerably decrease memory footprint (~*0.85), with a small
-     execution time penalty (~*1.10).  */
+     execution time penalty (~*1.10).  However, if this 15% gain in memory
+     usage prevents swapping, the execution time falls drastically. */
   
   sane_putenv ("GUILE_INIT_SEGMENT_SIZE_1", "4194304");
   sane_putenv ("GUILE_MAX_SEGMENT_SIZE", "8388608");
@@ -430,7 +440,7 @@ main (int argc, char **argv)
          {
            String s = oparser_p_static->optional_argument_ch_C_;
            Path p = split_path (s);
-           if (p.ext.empty_b ())
+           if (s != "-" && p.ext.empty_b ())
              p.ext = format_to_ext (output_format_global);
            output_name_global = p.str ();
          }