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 0eabab20218b243e591ad2b49dea4a3e255fc7f2..caf25a6908a24e8a7ef8d745d5f6a1e9cced187a 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -38,6 +38,8 @@
 #include "MenuBackend.h"
 #include "ToolbarDefaults.h"
 #include "lyxlex.h"
+#include "encoding.h"
+#include "converter.h"
 
 using std::endl;
 
@@ -365,13 +367,6 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        // Check that user LyX directory is ok.
        queryUserLyXDir(explicit_userdir);
 
-       //
-       // Load the layouts first
-       //
-
-       lyxerr[Debug::INIT] << "Reading layouts..." << endl;
-       LyXSetStyle();
-
        //
        // Shine up lyxrc defaults
        //
@@ -404,16 +399,32 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        //
 
        ReadRcFile("lyxrc.defaults");
-//     system_lyxrc = lyxrc;
+       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
+       converters.Update(formats);
+       converters.BuildGraph();
+
+       // Read encodings
+       ReadEncodingsFile("encodings");
+       // Read languages
+       ReadLangugesFile("languages");
+
+       // Load the layouts
+       lyxerr[Debug::INIT] << "Reading layouts..." << endl;
+       LyXSetStyle();
+
        // 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);
@@ -446,6 +457,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
        // lyxserver = new LyXServer;
 }
 
+
 // These are the default bindings known to LyX
 void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 {
@@ -495,6 +507,7 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("S-Tab", LFUN_SHIFT_TAB);  // jug20000522
 }
 
+
 // LyX can optionally take over the handling of deadkeys
 void LyX::deadKeyBindings(kb_keymap * kbmap)
 {
@@ -522,7 +535,6 @@ void LyX::deadKeyBindings(kb_keymap * kbmap)
 }
 
 
-
 // This one is not allowed to use anything on the main form, since that
 // one does not exist yet. (Asger)
 void LyX::queryUserLyXDir(bool explicit_userdir)
@@ -612,6 +624,7 @@ void LyX::ReadUIFile(string const & name)
 
        if (ui_path.empty()) {
                lyxerr[Debug::INIT] << "Could not find " << name << endl;
+               menubackend.defaults();
                return;
        }
        
@@ -628,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;
@@ -646,7 +659,37 @@ void LyX::ReadUIFile(string const & name)
 }
 
 
+// Read the languages file `name'
+void LyX::ReadLangugesFile(string const & name)
+{
+       lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
+
+       string lang_path = LibFileSearch(string(), name);
+       if (lang_path.empty()) {
+               lyxerr[Debug::INIT] << "Could not find " << name << endl;
+               languages.setDefaults();
+               return;
+       }
+       languages.read(lang_path);
+}
+
+
+// Read the encodings file `name'
+void LyX::ReadEncodingsFile(string const & name)
+{
+       lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
+
+       string enc_path = LibFileSearch(string(), name);
+       if (enc_path.empty()) {
+               lyxerr[Debug::INIT] << "Could not find " << name << endl;
+               return;
+       }
+       encodings.read(enc_path);
+}
+
+
 // Set debugging level and report result to user
+static
 void setDebuggingLevel(string const & dbgLevel)
 {
        lyxerr << _("Setting debug level to ") <<  dbgLevel << endl;
@@ -656,6 +699,7 @@ void setDebuggingLevel(string const & dbgLevel)
 
 
 // Give command line help
+static
 void commandLineHelp()
 {
        lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
@@ -669,14 +713,22 @@ 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;
 }
 
+
 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
@@ -742,12 +794,13 @@ bool LyX::easyParse(int * argc, char * argv[])
                                string type(argv[i+1]);
                                removeargs = 2;
                                batch_command = "buffer-export " + type;
+                               gui = false;
                        } else
                                lyxerr << _("Missing file type [eg latex, "
                                            "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]);
@@ -815,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);