-help, -version, & unqualified -dbg now go to cout

Makes output consistent with other programs and allows for piping that
is more user-friendly.
This commit is contained in:
Scott Kostyshak 2012-09-11 01:01:05 -04:00
parent 1451c7cf66
commit 4c1d45aac9

View File

@ -997,8 +997,8 @@ typedef boost::function<int(string const &, string const &, string &)> cmd_helpe
int parse_dbg(string const & arg, string const &, string &) int parse_dbg(string const & arg, string const &, string &)
{ {
if (arg.empty()) { if (arg.empty()) {
lyxerr << to_utf8(_("List of supported debug flags:")) << endl; cout << to_utf8(_("List of supported debug flags:")) << endl;
Debug::showTags(lyxerr); Debug::showTags(cout);
exit(0); exit(0);
} }
lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl; lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
@ -1011,7 +1011,7 @@ int parse_dbg(string const & arg, string const &, string &)
int parse_help(string const &, string const &, string &) int parse_help(string const &, string const &, string &)
{ {
lyxerr << cout <<
to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n" to_utf8(_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
"Command line switches (case sensitive):\n" "Command line switches (case sensitive):\n"
"\t-help summarize LyX usage\n" "\t-help summarize LyX usage\n"
@ -1054,11 +1054,11 @@ int parse_help(string const &, string const &, string &)
int parse_version(string const &, string const &, string &) int parse_version(string const &, string const &, string &)
{ {
lyxerr << "LyX " << lyx_version cout << "LyX " << lyx_version
<< " (" << lyx_release_date << ")" << endl; << " (" << lyx_release_date << ")" << endl;
lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl; cout << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << lyx_version_info << endl; cout << lyx_version_info << endl;
exit(0); exit(0);
return 0; return 0;
} }