patch::: 1.3.25.jcn2

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index 913810a2d4e05de0f655090cb1310fe6cdd24406..cd2ee91d95cdfe45d2aacb01b24458eb5357db51 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -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 ()
-{
-  cerr << 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);