ReadRcFile("lyxrc.defaults");
system_lyxrc = lyxrc;
+ system_formats = formats;
+ system_converters = converters;
+ system_lcolor = lcolor;
+
// If there is a preferences file we read that instead
// of the old lyxrc file.
if (!ReadRcFile("preferences"))
ReadRcFile("lyxrc");
/// Init Converter
- Converter::init();
+ converters.Update(formats);
+ converters.BuildGraph();
// Read encodings
ReadEncodingsFile("encodings");
// Ensure that we have really read a bind file, so that LyX is
// usable.
- if (!lyxrc.hasBindFile)
- lyxrc.ReadBindFile();
+ lyxrc.readBindFileIfNeeded();
// Read menus
ReadUIFile(lyxrc.ui_file);
lex.printTable(lyxerr);
while (lex.IsOK()) {
- switch(lex.lex()) {
+ switch (lex.lex()) {
case ui_menuset:
menubackend.read(lex);
break;
"\t-dbg feature[,feature]...\n"
" select the features to debug.\n"
" Type `lyx -dbg' to see the list of features\n"
- "Check the LyX man page for more options.") << endl;
+ "\t-x [--execute] command\n"
+ " where command is a lyx command.\n"
+ "\t-e [--export] fmt\n"
+ " where fmt is the export format of choice.\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"
+ "Check the LyX man page for more details.") << endl;
}
{
bool gui = true;
int removeargs = 0; // used when options are read
- for(int i = 1; i < *argc; ++i) {
+ for (int i = 1; i < *argc; ++i) {
string arg = argv[i];
// Check for -dbg int
"ps...] after ")
<< arg << _(" switch!") << endl;
}
- else if (arg == "--import") {
+ else if (arg == "-i" || arg == "--import") {
if (i + 1 < *argc) {
string type(argv[i+1]);
string file(argv[i+2]);
bufferlist.emergencyWriteAll();
lyxerr << "Bye." << endl;
- if(err_sig!= SIGHUP &&
+ if (err_sig!= SIGHUP &&
(!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
lyx::abort();
exit(0);