patch::: 1.3.25.jcn2

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index c4062cb1a40df72c39e7146b9d65bea1971a6b5f..cd2ee91d95cdfe45d2aacb01b24458eb5357db51 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -3,19 +3,19 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 #include <stdlib.h>
 #include <iostream.h>
 #include <assert.h>
 #include <locale.h>
+
 #include "lily-guile.hh"
 #include "lily-version.hh"
 
-#include "all-fonts.hh"
+#include "all-font-metrics.hh"
 #include "proto.hh"
-#include "dimensions.hh"
 #include "getopt-long.hh"
 #include "misc.hh"
 #include "string.hh"
@@ -86,9 +86,17 @@ Long_option_init theopts[] = {
   {0,0,0, 0}
 };
 
+void
+identify (ostream* os)
+{
+  *os << gnu_lilypond_version_str () << endl;
+}
+
 void
 usage ()
 {
+  identify (&cout);
+  cout << "\n";
   cout << _f ("Usage: %s [OPTION]... [FILE]...", "lilypond");
   cout << "\n\n";
   cout << _ ("Typeset music and or play MIDI from FILE");
@@ -127,16 +135,10 @@ _(
   cout << _f ("Report bugs to %s", "bug-gnu-music@gnu.org") << endl;
 }
 
-void
-identify ()
-{
-  cout << gnu_lilypond_version_str () << endl;
-}
-
 void
 version ()
 {
-  identify ();
+  identify (&cout);
   cout << '\n';
   cout << _f (""
   "This is free software.  It is covered by the GNU General Public License,\n"
@@ -145,7 +147,7 @@ version ()
     "lilypond");
   cout << endl;
 
-  cout << _f ("Copyright (c) %s by", "1996--1999");
+  cout << _f ("Copyright (c) %s by", "1996--2000");
   cout << "Han-Wen Nienhuys <hanwen@cs.uu.nl>\n"
        << "Jan Nieuwenhuizen <janneke@gnu.org>\n";
 }
@@ -157,7 +159,7 @@ notice ()
   // GNU GNU?
   cout << _ ("GNU LilyPond -- The GNU Project music typesetter");
   cout << '\n';
-  cout << _f ("Copyright (c) %s by", "1996--1999");
+  cout << _f ("Copyright (c) %s by", "1996--2000");
   cout << '\n';
   cout << "  Han-Wen Nienhuys <hanwen@cs.uu.nl>\n";
   cout << "  Jan Nieuwenhuizen <janneke@gnu.org>\n";
@@ -178,7 +180,6 @@ notice ()
             "USA.\n");
 }
 
-
 void
 setup_paths ()
 {
@@ -217,12 +218,13 @@ setup_paths ()
 
 
   char *suffixes[] = {"ly", "afm", "scm", "tfm", "cmtfm", "ps", 0};
-  for (char **s = suffixes; *s; s++){
-    if (!prefix_directory.empty_b())
-      global_path.add (prefix_directory + to_str ('/') + String (*s));
-    else
-      global_path.add (String (DIR_DATADIR) + to_str ('/') + String(*s));
-  }
+  for (char **s = suffixes; *s; s++)
+    {
+      if (!prefix_directory.empty_b())
+       global_path.add (prefix_directory + to_str ('/') + String (*s));
+      else
+       global_path.add (String (DIR_DATADIR) + to_str ('/') + String(*s));
+    }
 }
 
 
@@ -233,7 +235,7 @@ main_prog (int, char**)
     need to do this first. Engravers use lily.scm contents.
    */
   init_lily_guile ();
-  read_lily_scm_file ( "lily.scm");
+  read_lily_scm_file ("lily.scm");
   cout << endl;
 
   call_constructors ();
@@ -304,7 +306,7 @@ main (int argc, char **argv)
          break;
        case 't':
          experimental_features_global_b = true;
-         *mlog << "*** enabling experimental features, you're on your own now ***\n";
+         progress_indication ("*** enabling experimental features, you're on your own now ***\n");
          break;
        case 'o':
          outname_str_global = oparser_global_p->optional_argument_ch_C_;
@@ -352,7 +354,7 @@ main (int argc, char **argv)
          break;
        }
     }
-  identify ();
+  identify (&cerr);
 
 #ifdef WINNT
   gh_enter (argc, argv, main_prog);