#include "bufferlist.h"
#include "buffer.h"
+#include "buffer_funcs.h"
#include "lyxserver.h"
#include "kbmap.h"
#include "lyxfunc.h"
#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;
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);
}
// 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);
}
}
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()) {
+ s = *it;
+ }
+
+ last_loaded = bufferlist.newBuffer(s, false);
+ last_loaded->parseError.connect(boost::bind(&LyX::printError, this, _1));
+ loadLyXFile(last_loaded, s);
}
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
}
+void LyX::printError(ErrorItem const & ei)
+{
+ std::cerr << _("LyX: ") << ei.error
+ << ':' << ei.description << std::endl;
+
+}
+
+
void LyX::init(bool gui)
{
signal(SIGHUP, error_handler);
// Directories are searched in this order:
// 1) -sysdir command line parameter
- // 2) LYX_DIR_13x environment variable
+ // 2) LYX_DIR_14x 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
if (!system_lyxdir.empty())
searchpath = MakeAbsPath(system_lyxdir) + ';';
- string const lyxdir = GetEnvPath("LYX_DIR_13x");
+ string const lyxdir = GetEnvPath("LYX_DIR_14x");
if (!lyxdir.empty()) {
- lyxerr[Debug::INIT] << "LYX_DIR_13x: " << lyxdir << endl;
+ lyxerr[Debug::INIT] << "LYX_DIR_14x: " << lyxdir << endl;
searchpath += lyxdir + ';';
}
// Warn if environment variable is set, but unusable
if (!lyxdir.empty()) {
if (system_lyxdir != NormalizePath(lyxdir)) {
- lyxerr <<_("LYX_DIR_13x environment variable no good.")
+ lyxerr <<_("LYX_DIR_14x environment variable no good.")
<< '\n'
<< _("System directory set to: ")
<< system_lyxdir << endl;
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 "
+ <<_("set the environment variable LYX_DIR_14x to the "
"LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown) {
<< "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;
}
// Directories are searched in this order:
// 1) -userdir command line parameter
- // 2) LYX_USERDIR_13x environment variable
+ // 2) LYX_USERDIR_14x 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");
+ // LYX_USERDIR_14x environment variable
+ user_lyxdir = GetEnvPath("LYX_USERDIR_14x");
// default behaviour
if (user_lyxdir.empty())
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;
}
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)
toolbarbackend.read(lex);
break;
+ case ui_toolbars:
+ toolbarbackend.readToolbars(lex);
+ break;
+
default:
if (!rtrim(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
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 <<
projects / lyx.git / blobdiff