release: 1.3.43

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 41d2e36e2a0c37ab4b421e7658b776a7c81f1b5e..fcbd09e5c62a6fe8a543e3502314ceb80752d3f5 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -69,7 +69,7 @@ String distill_inname_str (String name_str, String& ext_r);
  */
 Long_option_init theopts[] = {
   {0, "debug", 'd',  _i ("enable debugging output")},
-  {_i ("EXT"), "output-format", 'f',  _i ("use output format EXT")},
+  {_i ("EXT"), "output-format", 'f',  _i ("use output format EXT (scm, ps, tex or as)")},
   {0, "help", 'h',  _i ("this help")},
   {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
   {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
@@ -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");
@@ -121,22 +129,16 @@ _(
     "localedir: `" DIR_LOCALEDIR "'\n"
     "\n";
 
-  print_mudela_versions (cout);
+
   cout << endl;
 
   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"
@@ -352,7 +354,7 @@ main (int argc, char **argv)
          break;
        }
     }
-  identify ();
+  identify (&cerr);
 
 #ifdef WINNT
   gh_enter (argc, argv, main_prog);