#endif
#include "version.h"
+#include <version_info.h>
#include "lyx_main.h"
#include "lyx_gui.h"
#include "LyXView.h"
#include "lyxrc.h"
#include "support/path.h"
#include "support/filetools.h"
+#include "buffer.h"
#include "bufferlist.h"
#include "debug.h"
#include "support/FileInfo.h"
#include "converter.h"
#include "language.h"
#include "support/os.h"
-// for NO_LATEX
-#if 1
-#include "lyxfont.h"
-#endif
using std::endl;
}
if (first_start) {
- string splash = i18nLibFileSearch("examples", "splash.lyx");
+ string const splash =
+ i18nLibFileSearch("examples", "splash.lyx");
lyxerr[Debug::INIT] << "Opening splash document "
<< splash << "..." << endl;
Buffer * loadb = bufferlist.loadLyXFile(splash);
}
-extern "C" void error_handler(int err_sig);
+extern "C" {
+
+static
+void error_handler(int err_sig)
+{
+ switch (err_sig) {
+ case SIGHUP:
+ lyxerr << "\nlyx: SIGHUP signal caught" << endl;
+ break;
+ case SIGINT:
+ // no comments
+ break;
+ case SIGFPE:
+ lyxerr << "\nlyx: SIGFPE signal caught" << endl;
+ break;
+ case SIGSEGV:
+ lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
+ lyxerr <<
+ "Sorry, you have found a bug in LyX."
+ " If possible, please read 'Known bugs'\n"
+ "under the Help menu and then send us "
+ "a full bug report. Thanks!" << endl;
+ break;
+ case SIGTERM:
+ // no comments
+ break;
+ }
+
+ // Deinstall the signal handlers
+ signal(SIGHUP, SIG_DFL);
+ signal(SIGINT, SIG_DFL);
+ signal(SIGFPE, SIG_DFL);
+ signal(SIGSEGV, SIG_DFL);
+ signal(SIGTERM, SIG_DFL);
+
+ bufferlist.emergencyWriteAll();
+
+ lyxerr << "Bye." << endl;
+ if (err_sig!= SIGHUP &&
+ (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
+ lyx::abort();
+ exit(0);
+}
+
+}
+
void LyX::init(bool gui)
{
<< searchpath << endl;
string const filename = "chkconfig.ltx";
- string temp = FileOpenSearch(searchpath, filename, string());
+ string const temp = FileOpenSearch(searchpath, filename, string());
system_lyxdir = OnlyPath(temp);
// Reduce "path/../path" stuff out of system directory
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
- if (gui)
+ if (gui) {
queryUserLyXDir(explicit_userdir);
- else
+ } else {
first_start = false;
-
+ }
+
//
// Shine up lyxrc defaults
//
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string lyxrc_path = LibFileSearch(string(), name);
+ string const lyxrc_path = LibFileSearch(string(), name);
if (!lyxrc_path.empty()){
lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
return false;
}
return true;
- } else
+ } else {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ }
+
return false;
}
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string ui_path = LibFileSearch("ui", name, "ui");
+ string const ui_path = LibFileSearch("ui", name, "ui");
if (ui_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
<< " in " << ui_path << endl;
LyXLex lex(uitags, ui_last - 1);
lex.setFile(ui_path);
- if (!lex.IsOK()) {
+ if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- while (lex.IsOK()) {
+ while (lex.isOK()) {
switch (lex.lex()) {
case ui_menuset:
menubackend.read(lex);
break;
default:
- if(!strip(lex.GetString()).empty())
+ if(!strip(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
"Unknown menu tag: `$$Token'");
break;
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string lang_path = LibFileSearch(string(), name);
+ string const lang_path = LibFileSearch(string(), name);
if (lang_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
languages.setDefaults();
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string enc_path = LibFileSearch(string(), name);
+ string const enc_path = LibFileSearch(string(), name);
if (enc_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
return;
// Give command line help
void commandLineHelp()
{
- lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
lyxerr <<
_("Usage: lyx [ command line switches ] [ name.lyx ... ]\n"
"Command line switches (case sensitive):\n"
"\t-i [--import] fmt file.xxx\n"
" where fmt is the import format of choice\n"
" and file.xxx is the file to be imported.\n"
+ "\t-version summarize version and build info\n"
"Check the LyX man page for more details.") << endl;
}
+// Give command line version information
+void commandLineVersionInfo()
+{
+ lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
+ lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
+
+ lyxerr << version_info << endl;
+}
+
+
} // namespace anon
commandLineHelp();
exit(0);
}
+ // Check for --version or -version
+ else if (arg == "--version" || arg == "-version") {
+ commandLineVersionInfo();
+ exit(0);
+ }
// Check for "-nw": No XWindows as for emacs this should
// give a LyX that could be used in a terminal window.
//else if (arg == "-nw") {
}
-extern "C"
-void error_handler(int err_sig)
-{
- switch (err_sig) {
- case SIGHUP:
- lyxerr << "\nlyx: SIGHUP signal caught" << endl;
- break;
- case SIGINT:
- // no comments
- break;
- case SIGFPE:
- lyxerr << "\nlyx: SIGFPE signal caught" << endl;
- break;
- case SIGSEGV:
- lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
- lyxerr <<
- "Sorry, you have found a bug in LyX."
- " If possible, please read 'Known bugs'\n"
- "under the Help menu and then send us "
- "a full bug report. Thanks!" << endl;
- break;
- case SIGTERM:
- // no comments
- break;
- }
-
- // Deinstall the signal handlers
- signal(SIGHUP, SIG_DFL);
- signal(SIGINT, SIG_DFL);
- signal(SIGFPE, SIG_DFL);
- signal(SIGSEGV, SIG_DFL);
- signal(SIGTERM, SIG_DFL);
-
- bufferlist.emergencyWriteAll();
-
- lyxerr << "Bye." << endl;
- if (err_sig!= SIGHUP &&
- (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
- lyx::abort();
- exit(0);
-}
projects / lyx.git / blobdiff