Various small fixes

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 3c8b6845f5a983847568efec024dc8fe7090a0ce..94c84c60de004e79459f0c86e11e938934f03f25 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -351,10 +351,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        bool explicit_userdir = true;
        if (user_lyxdir.empty()) {
 
-       // LYX_USERDIR_11x environment variable
+               // LYX_USERDIR_11x environment variable
                user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
 
-       // default behaviour
+               // default behaviour
                if (user_lyxdir.empty())
                        user_lyxdir = AddPath(GetEnvPath("HOME"),
                                                        string(".") + PACKAGE);
@@ -364,8 +364,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        lyxerr[Debug::INIT] << "User LyX directory: '" 
                            <<  user_lyxdir << '\'' << endl;
 
-       // Check that user LyX directory is ok.
-       queryUserLyXDir(explicit_userdir);
+       // Check that user LyX directory is ok. We don't do that if
+       // running in batch mode.
+       if (gui)
+               queryUserLyXDir(explicit_userdir);
 
        //
        // Shine up lyxrc defaults
@@ -401,6 +403,8 @@ 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.
@@ -408,7 +412,8 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
            ReadRcFile("lyxrc");
 
        /// Init Converter
-       Converter::init();
+       converters.Update(formats);
+       converters.BuildGraph();
 
        // Read encodings
        ReadEncodingsFile("encodings");
@@ -421,8 +426,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);
@@ -711,7 +715,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;
 }
 
 
@@ -791,7 +802,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]);