More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 045e8cc72a57c5c34c570696fc88aa39a35523a7..caf25a6908a24e8a7ef8d745d5f6a1e9cced187a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -400,13 +400,18 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        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");
@@ -419,8 +424,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        // 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);
@@ -637,7 +641,7 @@ void LyX::ReadUIFile(string const & name)
                lex.printTable(lyxerr);
 
        while (lex.IsOK()) {
-               switch(lex.lex()) {
+               switch (lex.lex()) {
                case ui_menuset: 
                        menubackend.read(lex);
                        break;
@@ -709,7 +713,14 @@ void commandLineHelp()
                   "\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;
 }
 
 
@@ -717,7 +728,7 @@ bool LyX::easyParse(int * argc, char * argv[])
 {
        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
@@ -789,7 +800,7 @@ bool LyX::easyParse(int * argc, char * argv[])
                                            "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]);
@@ -857,7 +868,7 @@ void error_handler(int err_sig)
        bufferlist.emergencyWriteAll();
 
        lyxerr << "Bye." << endl;
-       if(err_sig!= SIGHUP && 
+       if (err_sig!= SIGHUP && 
           (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
                lyx::abort();
        exit(0);