]> git.lyx.org Git - lyx.git/blobdiff - src/lyx_main.C
Point fix, earlier forgotten
[lyx.git] / src / lyx_main.C
index eb8bac0e895fff5468b9395b4b9908fd2963f436..dc59f8c2113b986cfe850b54a644d9166ea614cd 100644 (file)
@@ -1,25 +1,27 @@
 /**
  * \file lyx_main.C
- * Copyright 1995-2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- * \author unknown
+ * \author Alfredo Braunstein
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 #include <version.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "lyx_main.h"
 
 #include "support/filetools.h"
 #include "support/lyxlib.h"
-#include "support/os.h"
 #include "support/FileInfo.h"
 #include "support/path.h"
+#include "support/path_defines.h"
 #include "debug.h"
 #include "gettext.h"
 #include "lyxlex.h"
 
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxserver.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
-#include "ToolbarDefaults.h"
+#include "ToolbarBackend.h"
 #include "MenuBackend.h"
 #include "language.h"
 #include "lastfiles.h"
 #include "encoding.h"
 #include "converter.h"
+#include "format.h"
 #include "lyxtextclasslist.h"
 
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
-#include "BoostFormat.h"
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/signals/signal1.hpp>
 
 #include <cstdlib>
 #include <csignal>
+#include <iostream>
+
+using namespace lyx::support;
 
 using std::vector;
 using std::endl;
@@ -57,16 +65,10 @@ using std::signal;
 using std::system;
 #endif
 
-extern void LoadLyXFile(string const &);
 extern void QuitLyX();
 
 extern LyXServer * lyxserver;
 
-string system_lyxdir;
-string build_lyxdir;
-string system_tempdir;
-string user_lyxdir;
-
 DebugStream lyxerr;
 
 boost::scoped_ptr<LastFiles> lastfiles;
@@ -77,6 +79,17 @@ BufferList bufferlist;
 // convenient to have it here.
 boost::scoped_ptr<kb_keymap> toplevel_keymap;
 
+namespace {
+
+void showFileError(string const & error)
+{
+       Alert::warning(_("Could not read configuration file"),
+                  bformat(_("Error while reading the configuration file\n%1$s.\n"
+                    "Please check your installation."), error));
+       exit(EXIT_FAILURE);
+}
+
+}
 
 LyX::LyX(int & argc, char * argv[])
 {
@@ -84,37 +97,20 @@ LyX::LyX(int & argc, char * argv[])
        // we need to parse for "-dbg" and "-help"
        bool const want_gui = easyParse(argc, argv);
 
-       // Global bindings (this must be done as early as possible.) (Lgb)
-       toplevel_keymap.reset(new kb_keymap);
-       defaultKeyBindings(toplevel_keymap.get());
-
        // set the DisplayTranslator only once; should that be done here??
        // if this should not be in this file, please also remove
        // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye.
-       grfx::setDisplayTranslator();
-
-       lyxerr << argc << endl;
+       lyx::graphics::setDisplayTranslator();
 
-       if (want_gui) {
-               lyxerr <<  "parsinint" << endl;
+       if (want_gui)
                lyx_gui::parse_init(argc, argv);
-       }
-
-       lyxerr << argc << endl;
 
        // check for any spurious extra arguments
        // other than documents
        for (int argi = 1; argi < argc ; ++argi) {
                if (argv[argi][0] == '-') {
-#if USE_BOOST_FORMAT
-                       lyxerr << boost::format(_("Wrong command line option `%1$s'. Exiting."))
-                               % argv[argi]
-                              << endl;
-#else
-                       lyxerr << _("Wrong command line option `")
-                              << argv[argi] << _("'. Exiting.")
-                              << endl;
-#endif
+                       lyxerr << bformat(_("Wrong command line option `%1$s'. Exiting."),
+                               argv[argi]) << endl;
                        exit(1);
                }
        }
@@ -124,48 +120,53 @@ LyX::LyX(int & argc, char * argv[])
        init(want_gui);
        lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
 
-       if (want_gui) {
+       if (want_gui) 
                lyx_gui::parse_lyxrc();
-       }
 
        vector<string> files;
 
-       for (int argi = argc - 1; argi >= 1; --argi) {
+       for (int argi = argc - 1; argi >= 1; --argi) 
                files.push_back(argv[argi]);
-       }
 
-       if (first_start) {
+       if (first_start)
                files.push_back(i18nLibFileSearch("examples", "splash.lyx"));
-       }
 
        // Execute batch commands if available
        if (!batch_command.empty()) {
+
                lyxerr[Debug::INIT] << "About to handle -x '"
                       << batch_command << '\'' << endl;
 
                Buffer * last_loaded = 0;
 
-               vector<string>::iterator it = files.begin();
-               vector<string>::iterator end = files.end();
+               vector<string>::const_iterator it = files.begin();
+               vector<string>::const_iterator end = files.end();
+
                for (; it != end; ++it) {
-                       last_loaded = bufferlist.loadLyXFile(*it);
+                       // get absolute path of file and add ".lyx" to
+                       // the filename if necessary
+                       string s = FileSearch(string(), *it, "lyx");
+                       if (s.empty()) {
+                               last_loaded = newFile(*it, string(), true);
+                       } else {
+                               Buffer * buf = bufferlist.newBuffer(s, false);
+                               buf->error.connect(boost::bind(&LyX::printError, this, _1));
+                               if (loadLyXFile(buf, s)) 
+                                       last_loaded = buf;
+                               else
+                                       bufferlist.release(buf);
+                       }
                }
 
-               files.clear();
-
-               // no buffer loaded, create one
-               if (!last_loaded)
-                       last_loaded = bufferlist.newFile("tmpfile", string());
-
-               bool success = false;
-
                // try to dispatch to last loaded buffer first
-               bool const dispatched = last_loaded->dispatch(batch_command, &success);
-
-               if (dispatched) {
-                       QuitLyX();
-                       exit(!success);
-               }
+               if (last_loaded) {
+                       bool success = false;
+                       if (last_loaded->dispatch(batch_command, &success)) {
+                               QuitLyX();
+                               exit(!success);
+                       }
+               } 
+               files.clear(); // the files are already loaded
        }
 
        lyx_gui::start(batch_command, files);
@@ -211,13 +212,21 @@ static void error_handler(int err_sig)
        lyxerr << "Bye." << endl;
        if (err_sig!= SIGHUP &&
           (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
-               lyx::abort();
+               lyx::support::abort();
        exit(0);
 }
 
 }
 
 
+void LyX::printError(ErrorItem const & ei)
+{
+       std::cerr << _("LyX: ") << ei.error
+                 << ':' << ei.description << std::endl;
+
+}
+
+
 void LyX::init(bool gui)
 {
        signal(SIGHUP, error_handler);
@@ -226,192 +235,7 @@ void LyX::init(bool gui)
        signal(SIGINT, error_handler);
        signal(SIGTERM, error_handler);
 
-       //
-       // Determine path of binary
-       //
-
-       string binpath = os::binpath();
-       string binname = os::binname();
-       string fullbinname = MakeAbsPath(binname, binpath);
-
-       if (binpath.empty()) {
-               lyxerr << _("Warning: could not determine path of binary.")
-                      << "\n"
-                      << _("If you have problems, try starting LyX with an absolute path.")
-                      << endl;
-       }
-       lyxerr[Debug::INIT] << "Name of binary: " << binname << endl;
-       lyxerr[Debug::INIT] << "Path of binary: " << binpath << endl;
-
-       //
-       // Determine system directory.
-       //
-
-       // Directories are searched in this order:
-       // 1) -sysdir command line parameter
-       // 2) LYX_DIR_13x environment variable
-       // 3) Maybe <path of binary>/TOP_SRCDIR/lib
-       // 4) <path of binary>/../share/<name of binary>/
-       // 4a) repeat 4 after following the Symlink if <path of
-       //     binary> is a symbolic link.
-       // 5) hardcoded lyx_dir
-       // The directory is checked for the presence of the file
-       // "chkconfig.ltx", and if that is present, the directory
-       // is accepted as the system directory.
-       // If no chkconfig.ltx file is found, a warning is given,
-       // and the hardcoded lyx_dir is used.
-
-       // If we had a command line switch, system_lyxdir is already set
-       string searchpath;
-       if (!system_lyxdir.empty())
-               searchpath = MakeAbsPath(system_lyxdir) + ';';
-
-       string const lyxdir = GetEnvPath("LYX_DIR_13x");
-
-       if (!lyxdir.empty()) {
-               lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
-               searchpath += lyxdir + ';';
-       }
-
-       string fullbinpath = binpath;
-       FileInfo file(fullbinname, true);
-       if (file.isLink()) {
-               lyxerr[Debug::INIT] << "binary is a link" << endl;
-               string link;
-               if (LyXReadLink(fullbinname, link, true)) {
-                       // Path of binary/../share/name of binary/
-                       searchpath += NormalizePath(AddPath(binpath,
-                                                           "../share/")
-                                                   + OnlyFilename(binname));
-                       searchpath += ';';
-                       fullbinpath = link;
-                       binpath = MakeAbsPath(OnlyPath(fullbinpath));
-               }
-       }
-
-       bool followlink;
-       do {
-               // Path of binary/../share/name of binary/
-               searchpath += NormalizePath(AddPath(binpath, "../share/") +
-                     OnlyFilename(binname)) + ';';
-
-               // Follow Symlinks
-               FileInfo file(fullbinpath, true);
-               followlink = file.isLink();
-               if (followlink) {
-                       lyxerr[Debug::INIT] << " directory " << fullbinpath
-                                           << " is a link" << endl;
-                       string link;
-                       if (LyXReadLink(fullbinpath, link, true)) {
-                               fullbinpath = link;
-                               binpath = MakeAbsPath(OnlyPath(fullbinpath));
-                       }
-                       else {
-                               followlink = false;
-                       }
-               }
-       } while (followlink);
-
-       // <path of binary>/TOP_SRCDIR/lib
-       build_lyxdir = MakeAbsPath("../lib", binpath);
-       if (!FileSearch(build_lyxdir, "lyxrc.defaults").empty()) {
-               searchpath += MakeAbsPath(AddPath(TOP_SRCDIR, "lib"),
-                                         binpath) + ';';
-               lyxerr[Debug::INIT] << "Checking whether LyX is run in "
-                       "place... yes" << endl;
-       } else {
-               lyxerr[Debug::INIT]
-                       << "Checking whether LyX is run in place... no"
-                       << endl;
-               build_lyxdir.erase();
-       }
-
-       // Hardcoded dir
-       searchpath += LYX_DIR;
-
-       lyxerr[Debug::INIT] << "System directory search path: "
-                           << searchpath << endl;
-
-       string const filename = "chkconfig.ltx";
-       string const temp = FileOpenSearch(searchpath, filename, string());
-       system_lyxdir = OnlyPath(temp);
-
-       // Reduce "path/../path" stuff out of system directory
-       system_lyxdir = NormalizePath(system_lyxdir);
-
-       bool path_shown = false;
-
-       // Warn if environment variable is set, but unusable
-       if (!lyxdir.empty()) {
-               if (system_lyxdir != NormalizePath(lyxdir)) {
-                       lyxerr <<_("LYX_DIR_13x environment variable no good.")
-                              << '\n'
-                              << _("System directory set to: ")
-                              << system_lyxdir << endl;
-                       path_shown = true;
-               }
-       }
-
-       // Warn the user if we couldn't find "chkconfig.ltx"
-       if (system_lyxdir == "./") {
-               lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
-                      <<_("Try the '-sysdir' command line parameter or ")
-                      <<_("set the environment variable LYX_DIR_13x to the "
-                          "LyX system directory ")
-                      << _("containing the file `chkconfig.ltx'.") << endl;
-               if (!path_shown) {
-                       FileInfo fi(LYX_DIR);
-                       if (!fi.exist()) {
-                               lyxerr << "Couldn't even find the default LYX_DIR." << endl
-                                       << "Giving up." << endl;
-                               exit(1);
-                       }
-#if USE_BOOST_FORMAT
-                       lyxerr << boost::format(_("Using built-in default %1$s"
-                                                 " but expect problems."))
-                               % static_cast<char *>(LYX_DIR)
-                              << endl;
-#else
-                       lyxerr << _("Using built-in default ") << LYX_DIR
-                              << _(" but expect problems.")
-                              << endl;
-#endif
-               } else {
-                       lyxerr << _("Expect problems.") << endl;
-               }
-               system_lyxdir = LYX_DIR;
-               path_shown = true;
-       }
-
-       if (!path_shown)
-               lyxerr[Debug::INIT] << "System directory: '"
-                                   << system_lyxdir << '\'' << endl;
-
-       //
-       // Determine user lyx-dir
-       //
-
-       // Directories are searched in this order:
-       // 1) -userdir command line parameter
-       // 2) LYX_USERDIR_13x environment variable
-       // 3) $HOME/.<name of binary>
-
-       // If we had a command line switch, user_lyxdir is already set
-       bool explicit_userdir = true;
-       if (user_lyxdir.empty()) {
-
-               // LYX_USERDIR_13x environment variable
-               user_lyxdir = GetEnvPath("LYX_USERDIR_13x");
-
-               // default behaviour
-               if (user_lyxdir.empty())
-                       user_lyxdir = AddPath(GetEnvPath("HOME"),
-                                                       string(".") + PACKAGE);
-                       explicit_userdir = false;
-       }
-
-       lyxerr[Debug::INIT] << "User LyX directory: '"
-                           <<  user_lyxdir << '\'' << endl;
+       bool const explicit_userdir = setLyxPaths();
 
        // Check that user LyX directory is ok. We don't do that if
        // running in batch mode.
@@ -421,23 +245,23 @@ void LyX::init(bool gui)
                first_start = false;
        }
 
-       //
-       // Shine up lyxrc defaults
-       //
+       // Disable gui when easyparse says so
+       lyx_gui::use_gui = gui;
 
-       // Default template path: system_dir/templates
        if (lyxrc.template_path.empty()) {
-               lyxrc.template_path = AddPath(system_lyxdir, "templates");
+               lyxrc.template_path = AddPath(system_lyxdir(), "templates");
        }
 
-       // Default lastfiles file: $HOME/.lyx/lastfiles
        if (lyxrc.lastfiles.empty()) {
-               lyxrc.lastfiles = AddName(user_lyxdir, "lastfiles");
+               lyxrc.lastfiles = AddName(user_lyxdir(), "lastfiles");
        }
 
-       // Disable gui when either lyxrc or easyparse says so
-       if (!gui)
-               lyxrc.use_gui = false;
+       if (lyxrc.roman_font_name.empty())
+               lyxrc.roman_font_name = lyx_gui::roman_font_name();
+       if (lyxrc.sans_font_name.empty())
+               lyxrc.sans_font_name = lyx_gui::sans_font_name();
+       if (lyxrc.typewriter_font_name.empty())
+               lyxrc.typewriter_font_name = lyx_gui::typewriter_font_name();
 
        //
        // Read configuration files
@@ -449,10 +273,12 @@ void LyX::init(bool gui)
        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");
+       string prefsfile = "preferences";
+       // back compatibility to lyxs < 1.1.6
+       if (LibFileSearch(string(), prefsfile).empty())
+               prefsfile = "lyxrc";
+       if (!LibFileSearch(string(), prefsfile).empty())
+               readRcFile(prefsfile);
 
        readEncodingsFile("encodings");
        readLanguagesFile("languages");
@@ -461,21 +287,22 @@ void LyX::init(bool gui)
        lyxerr[Debug::INIT] << "Reading layouts..." << endl;
        LyXSetStyle();
 
-       // Ensure that we have really read a bind file, so that LyX is
-       // usable.
-       lyxrc.readBindFileIfNeeded();
+       if (gui) {
+               // Set up bindings
+               toplevel_keymap.reset(new kb_keymap);
+               defaultKeyBindings(toplevel_keymap.get());
+               toplevel_keymap->read(lyxrc.bind_file);
 
-       // Read menus
-       readUIFile(lyxrc.ui_file);
+               // Read menus
+               readUIFile(lyxrc.ui_file);
+       }
 
-       if (lyxerr.debugging(Debug::LYXRC)) {
+       if (lyxerr.debugging(Debug::LYXRC))
                lyxrc.print();
-       }
 
        os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
-       system_tempdir = os::getTmpDir();
        if (lyxerr.debugging(Debug::INIT)) {
-               lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
+               lyxerr << "LyX tmp dir: `" << os::getTmpDir() << '\'' << endl;
        }
 
        lyxerr[Debug::INIT] << "Reading lastfiles `"
@@ -493,8 +320,8 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("Up", LFUN_UP);
        kbmap->bind("Down", LFUN_DOWN);
 
-       kbmap->bind("Tab", LFUN_TAB);
-       kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
+       kbmap->bind("Tab", LFUN_CELL_FORWARD);
+       kbmap->bind("ISO_Left_Tab", LFUN_CELL_FORWARD); // jbl 2001-23-02
 
        kbmap->bind("Home", LFUN_HOME);
        kbmap->bind("End", LFUN_END);
@@ -538,9 +365,9 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
        kbmap->bind("KP_Prior", LFUN_PRIOR);
        kbmap->bind("KP_Next", LFUN_NEXT);
 
-       kbmap->bind("C-Tab", LFUN_TABINSERT);  // ale970515
-       kbmap->bind("S-Tab", LFUN_SHIFT_TAB);  // jug20000522
-       kbmap->bind("S-ISO_Left_Tab", LFUN_SHIFT_TAB); // jbl 2001-23-02
+       kbmap->bind("C-Tab", LFUN_CELL_SPLIT);  // ale970515
+       kbmap->bind("S-Tab", LFUN_CELL_BACKWARD);  // jug20000522
+       kbmap->bind("S-ISO_Left_Tab", LFUN_CELL_BACKWARD); // jbl 2001-23-02
 }
 
 
@@ -585,19 +412,19 @@ void LyX::deadKeyBindings(kb_keymap * kbmap)
 
 void LyX::queryUserLyXDir(bool explicit_userdir)
 {
-       string const configure_script = AddName(system_lyxdir, "configure");
+       string const configure_script = AddName(system_lyxdir(), "configure");
 
        // Does user directory exist?
-       FileInfo fileInfo(user_lyxdir);
+       FileInfo fileInfo(user_lyxdir());
        if (fileInfo.isOK() && fileInfo.isDir()) {
                first_start = false;
                FileInfo script(configure_script);
-               FileInfo defaults(AddName(user_lyxdir, "lyxrc.defaults"));
+               FileInfo defaults(AddName(user_lyxdir(), "lyxrc.defaults"));
                if (defaults.isOK() && script.isOK()
                    && defaults.getModificationTime() < script.getModificationTime()) {
                        lyxerr << _("LyX: reconfiguring user directory")
                               << endl;
-                       Path p(user_lyxdir);
+                       Path p(user_lyxdir());
                        ::system(configure_script.c_str());
                        lyxerr << "LyX: " << _("Done!") << endl;
                }
@@ -606,77 +433,39 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
 
        first_start = !explicit_userdir;
 
-       // If the user specified explicitly a directory, ask whether
-       // to create it (otherwise, always create it)
-       if (explicit_userdir &&
-           !Alert::askQuestion(_("You have specified an invalid LyX directory."),
-                        _("It is needed to keep your own configuration."),
-                        _("Should I try to set it up for you (recommended)?"))) {
-               lyxerr << _("Running without personal LyX directory.") << endl;
-               // No, let's use $HOME instead.
-               user_lyxdir = GetEnvPath("HOME");
-               return;
-       }
-
-#if USE_BOOST_FORMAT
-       lyxerr << boost::format(_("LyX: Creating directory %1$s"
-                                 " and running configure..."))
-               % user_lyxdir
-              << endl;
-#else
-       lyxerr << _("LyX: Creating directory ") << user_lyxdir
-              << _(" and running configure...")
-              << endl;
-#endif
+       lyxerr << bformat(_("LyX: Creating directory %1$s"
+                                 " and running configure..."), user_lyxdir()) << endl;
 
-       if (!createDirectory(user_lyxdir, 0755)) {
+       if (!createDirectory(user_lyxdir(), 0755)) {
                // Failed, let's use $HOME instead.
-               user_lyxdir = GetEnvPath("HOME");
-#if USE_BOOST_FORMAT
-               lyxerr << boost::format(_("Failed. Will use %1$s instead."))
-                       % user_lyxdir
-                      << endl;
-#else
-               lyxerr << _("Failed. Will use ") << user_lyxdir <<
-                       _(" instead.")
-                      << endl;
-#endif
+               user_lyxdir(GetEnvPath("HOME"));
+               lyxerr << bformat(_("Failed. Will use %1$s instead."),
+                       user_lyxdir()) << endl;
                return;
        }
 
        // Run configure in user lyx directory
-       Path p(user_lyxdir);
+       Path p(user_lyxdir());
        ::system(configure_script.c_str());
        lyxerr << "LyX: " << _("Done!") << endl;
 }
 
 
-bool LyX::readRcFile(string const & name)
+void LyX::readRcFile(string const & name)
 {
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
        string const lyxrc_path = LibFileSearch(string(), name);
        if (!lyxrc_path.empty()) {
+
                lyxerr[Debug::INIT] << "Found " << name
                                    << " in " << lyxrc_path << endl;
-               if (lyxrc.read(lyxrc_path) < 0) {
-#if USE_BOOST_FORMAT
-                       Alert::alert(_("LyX Warning!"),
-                                  boost::io::str(boost::format(_("Error while reading %1$s.")) % lyxrc_path),
-                                  _("Using built-in defaults."));
-#else
-                       Alert::alert(_("LyX Warning!"),
-                                  _("Error while reading ") + lyxrc_path,
-                                  _("Using built-in defaults."));
-#endif
-                       return false;
-               }
-               return true;
-       } else {
-               lyxerr[Debug::INIT] << "Could not find " << name << endl;
+
+               if (lyxrc.read(lyxrc_path) >= 0)
+                       return;
        }
 
-       return false;
+       showFileError(name);
 }
 
 
@@ -686,23 +475,41 @@ void LyX::readUIFile(string const & name)
        enum Uitags {
                ui_menuset = 1,
                ui_toolbar,
+               ui_toolbars,
+               ui_include,
                ui_last
        };
 
        struct keyword_item uitags[ui_last - 1] = {
+               { "include", ui_include },
                { "menuset", ui_menuset },
-               { "toolbar", ui_toolbar }
+               { "toolbar", ui_toolbar },
+               { "toolbars", ui_toolbars }
        };
 
+       // Ensure that a file is read only once (prevents include loops)
+       static std::list<string> uifiles;
+       std::list<string>::const_iterator it  = uifiles.begin();
+       std::list<string>::const_iterator end = uifiles.end();
+       it = std::find(it, end, name);
+       if (it != end) {
+               lyxerr[Debug::INIT] << "UI file '" << name
+                                   << "' has been read already. "
+                                   << "Is this an include loop?"
+                                   << endl;
+               return;
+       }
+
        lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
 
        string const ui_path = LibFileSearch("ui", name, "ui");
 
        if (ui_path.empty()) {
                lyxerr[Debug::INIT] << "Could not find " << name << endl;
-               menubackend.defaults();
+               showFileError(name);
                return;
        }
+       uifiles.push_back(name);
 
        lyxerr[Debug::INIT] << "Found " << name
                            << " in " << ui_path << endl;
@@ -718,12 +525,22 @@ void LyX::readUIFile(string const & name)
 
        while (lex.isOK()) {
                switch (lex.lex()) {
+               case ui_include: {
+                       lex.next(true);
+                       string const file = lex.getString();
+                       readUIFile(file);
+                       break;
+               }
                case ui_menuset:
                        menubackend.read(lex);
                        break;
 
                case ui_toolbar:
-                       toolbardefaults.read(lex);
+                       toolbarbackend.read(lex);
+                       break;
+
+               case ui_toolbars:
+                       toolbarbackend.readToolbars(lex);
                        break;
 
                default:
@@ -743,8 +560,7 @@ void LyX::readLanguagesFile(string const & name)
 
        string const lang_path = LibFileSearch(string(), name);
        if (lang_path.empty()) {
-               lyxerr[Debug::INIT] << "Could not find " << name << endl;
-               languages.setDefaults();
+               showFileError(name);
                return;
        }
        languages.read(lang_path);
@@ -758,7 +574,7 @@ void LyX::readEncodingsFile(string const & name)
 
        string const enc_path = LibFileSearch(string(), name);
        if (enc_path.empty()) {
-               lyxerr[Debug::INIT] << "Could not find " << name << endl;
+               showFileError(name);
                return;
        }
        encodings.read(enc_path);
@@ -780,19 +596,14 @@ int parse_dbg(string const & arg, string const &)
                Debug::showTags(lyxerr);
                exit(0);
        }
-#if USE_BOOST_FORMAT
-       lyxerr << boost::format(_("Setting debug level to %1$s"))
-               % arg
-              << endl;
-#else
-       lyxerr << _("Setting debug level to ") << arg << endl;
-#endif
+       lyxerr << bformat(_("Setting debug level to %1$s"), arg) << endl;
 
        lyxerr.level(Debug::value(arg));
        Debug::showLevel(lyxerr, lyxerr.level());
        return 1;
 }
 
+
 int parse_help(string const &, string const &)
 {
        lyxerr <<
@@ -835,7 +646,7 @@ int parse_sysdir(string const & arg, string const &)
                lyxerr << _("Missing directory for -sysdir switch") << endl;
                exit(1);
        }
-       system_lyxdir = arg;
+       system_lyxdir(arg);
        return 1;
 }
 
@@ -845,7 +656,7 @@ int parse_userdir(string const & arg, string const &)
                lyxerr << _("Missing directory for -userdir switch") << endl;
                exit(1);
        }
-       user_lyxdir = arg;
+       user_lyxdir(arg);
        return 1;
 }