added a parseError signal to Buffer and use it

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index ba262926874ee876fd9b6cd5697b4c37d47378b7..dee88dd305b48c049a4f4c923c2c37de9ce8482c 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -24,6 +24,7 @@
 
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "lyxserver.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
@@ -39,11 +40,13 @@
 #include "frontends/Alert.h"
 #include "frontends/lyx_gui.h"
 
-#include "support/BoostFormat.h"
 #include <boost/function.hpp>
+#include <boost/bind.hpp>
+#include <boost/signals/signal1.hpp>
 
 #include <cstdlib>
 #include <csignal>
+#include <iostream>
 
 using std::vector;
 using std::endl;
@@ -78,16 +81,9 @@ namespace {
 
 void showFileError(string const & error)
 {
-#if USE_BOOST_FORMAT
        Alert::warning(_("Could not read configuration file"),
-                  boost::io::str(boost::format(
-                  _("Error while reading the configuration file\n%1$s.\n"
-                    "Please check your installation.")) % error));
-#else
-       Alert::warning(_("Could not read configuration file"),
-                  string(_("Error while reading the configuration file\n"))
-                  + error + _(".\nPlease check your installation."));
-#endif
+                  bformat(_("Error while reading the configuration file\n%1$s.\n"
+                    "Please check your installation."), error));
        exit(EXIT_FAILURE);
 }
 
@@ -116,15 +112,8 @@ LyX::LyX(int & argc, char * argv[])
        // 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);
                }
        }
@@ -157,14 +146,17 @@ LyX::LyX(int & argc, char * argv[])
                vector<string>::iterator it = files.begin();
                vector<string>::iterator end = files.end();
                for (; it != end; ++it) {
-                       last_loaded = bufferlist.loadLyXFile(*it);
+                       last_loaded = bufferlist.newBuffer(*it, false);
+                       last_loaded->parseError.connect(boost::bind(&LyX::printError, this, _1));
+                       loadLyXFile(last_loaded, *it);
                }
 
                files.clear();
 
                // no buffer loaded, create one
+               string const tmpfile = "tmpfile";
                if (!last_loaded)
-                       last_loaded = bufferlist.newFile("tmpfile", string());
+                       last_loaded = newFile(tmpfile, string());
 
                bool success = false;
 
@@ -227,6 +219,14 @@ static void error_handler(int err_sig)
 }
 
 
+void LyX::printError(ErrorItem const & ei)
+{
+       std::cerr << _("LyX: ") << ei.error 
+                 << ':' << ei.description << std::endl;
+
+}
+
+
 void LyX::init(bool gui)
 {
        signal(SIGHUP, error_handler);
@@ -375,16 +375,8 @@ void LyX::init(bool gui)
                                        << "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
+                       lyxerr << bformat(_("Using built-in default %1$s but expect problems."),
+                               LYX_DIR) << endl;
                } else {
                        lyxerr << _("Expect problems.") << endl;
                }
@@ -616,29 +608,14 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
 
        first_start = !explicit_userdir;
 
-#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)) {
                // 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
+               lyxerr << bformat(_("Failed. Will use %1$s instead."),
+                       user_lyxdir) << endl;
                return;
        }
 
@@ -673,14 +650,31 @@ 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");
@@ -690,6 +684,7 @@ void LyX::readUIFile(string const & name)
                showFileError(name);
                return;
        }
+       uifiles.push_back(name);
 
        lyxerr[Debug::INIT] << "Found " << name
                            << " in " << ui_path << endl;
@@ -705,6 +700,12 @@ 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;
@@ -713,6 +714,10 @@ void LyX::readUIFile(string const & name)
                        toolbarbackend.read(lex);
                        break;
 
+               case ui_toolbars:
+                       toolbarbackend.readToolbars(lex);
+                       break;
+
                default:
                        if (!rtrim(lex.getString()).empty())
                                lex.printError("LyX::ReadUIFile: "
@@ -766,19 +771,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 <<