* lily/include/scm-hash.hh (class Scheme_hash_table): idem.

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index ca5bc6b2407ce082014269fa02805b97110849b3..58d7553430158f16145b5c44df83acce45ea5fb0 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -154,12 +154,10 @@ usage ()
   /* No version number or newline here. It confuses help2man.  */
   printf (_f ("Usage: %s [OPTIONS]... FILE...", "lilypond").to_str0 ());
   printf ("\n\n");
-  printf (_ ("Typeset music and or play MIDI from FILE.").to_str0 ());
+  printf (_ ("Typeset music and/or produce MIDI from FILE.").to_str0 ());
   printf ("\n\n");
-  printf(_ (
-"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
-"using a high level description file as input.  LilyPond is part of \n"
-"the GNU Project.\n"
+  printf(_ ("LilyPond produces beautiful music notation.\n"
+           "For more information, see http://lilypond.org/"
 ).to_str0 ());
 
   printf ("\n");
@@ -167,8 +165,6 @@ usage ()
   printf ("\n");
   printf (Long_option_init::table_string (options_static).to_str0 ());
   printf ("\n");
-  printf ("\n");
-
   printf (_f ("Report bugs to %s.", "bug-lilypond@gnu.org").to_str0 ());
   printf ("\n");
   printf ("\n");
@@ -275,7 +271,7 @@ Path
 distill_inname (String str)
 {
   Path p = split_path (str);
-  if (str.empty_b () || str == "-")
+  if (str.is_empty () || str == "-")
     p.base = "-";
   else
     {
@@ -284,10 +280,10 @@ distill_inname (String str)
       for (int i = 0; extensions[i]; i++)
        {
          p.ext = orig_ext;
-         if (*extensions[i] && !p.ext.empty_b ())
+         if (*extensions[i] && !p.ext.is_empty ())
            p.ext += ".";
          p.ext += extensions[i];
-         if (!global_path.find (p.to_string ()).empty_b ())
+         if (!global_path.find (p.to_string ()).is_empty ())
              break;
        }
       /* Reshuffle extension */
@@ -296,15 +292,6 @@ distill_inname (String str)
   return p;
 }
 
-String
-format_to_ext (String format)
-{
-  if (format == "tex")
-    /* .lytex change put off */
-    return "tex"; // "lytex";
-  return format;
-}
-
 void
 prepend_load_path (String dir)
 {
@@ -357,35 +344,28 @@ main_prog (void *, int, char **)
   do
     {
       String infile (arg);
-      Midi_def::reset_score_count ();
-      Paper_def::reset_score_count ();
-
       Path inpath = distill_inname (infile);
 
       /* By default, use base name of input file for output file name */
       Path outpath = inpath;
       if (inpath.to_string () != "-")
-       outpath.ext = format_to_ext (output_format_global);
+       outpath.ext = output_format_global;
 
       /* By default, write output to cwd; do not copy directory part
          of input file name */
       outpath.root = "";
       outpath.dir = "";
       
-      if (!output_name_global.empty_b ())
+      if (!output_name_global.is_empty ())
        outpath = split_path (output_name_global);
       
       String init;
-      if (!init_name_global.empty_b ())
+      if (!init_name_global.is_empty ())
        init = init_name_global;
       else
        init = "init.ly";
        
-      /* Burp: output name communication goes through _global */
-      String save_output_name_global = output_name_global;
-      output_name_global = outpath.to_string ();
-      do_one_file (init, inpath.to_string ());
-      output_name_global = save_output_name_global;
+      do_one_file (init, inpath.to_string (), outpath.to_string ());
       
       p++;
     } while ((arg  = oparser_p_static->get_next_arg ()));
@@ -440,8 +420,9 @@ main (int argc, char **argv)
          {
            String s = oparser_p_static->optional_argument_str0_;
            Path p = split_path (s);
-           if (s != "-" && p.ext.empty_b ())
-             p.ext = format_to_ext (output_format_global);
+           if (s != "-" && p.ext.is_empty ())
+             p.ext = output_format_global;
+
            output_name_global = p.to_string ();
          }
          break;
@@ -456,8 +437,11 @@ main (int argc, char **argv)
        case 'f':
          if (oparser_p_static->optional_argument_str0_ == "help")
            {
-             printf("See http://lilypond.org/wiki?OutputFormats for more information.\n"\
-                    "This option is for developers only.\n");
+             printf("This option is for developers only;  Read the source code for more information\n");
+             
+             // actually it's not here,
+             // but we award you special points for looking here.
+             
              exit (0);
            }
          output_format_global = oparser_p_static->optional_argument_str0_;
@@ -494,7 +478,6 @@ main (int argc, char **argv)
          break;
        }
     }
-  identify (stderr);
 
   if (help_b)
     {