#include <config.h>
#include <version.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "lyx_main.h"
#include "support/filetools.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 "support/BoostFormat.h"
#include <boost/function.hpp>
#include <cstdlib>
// convenient to have it here.
boost::scoped_ptr<kb_keymap> toplevel_keymap;
+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
+ exit(EXIT_FAILURE);
+}
+
+}
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;
+ << argv[argi] << _("'. Exiting.")
+ << endl;
+#endif
exit(1);
}
}
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;
+ << batch_command << '\'' << endl;
Buffer * last_loaded = 0;
FileInfo file(fullbinpath, true);
followlink = file.isLink();
if (followlink) {
- lyxerr << " directory " << fullbinpath
- << " is a link" << endl;
+ lyxerr[Debug::INIT] << " directory " << fullbinpath
+ << " is a link" << endl;
string link;
if (LyXReadLink(fullbinpath, link, true)) {
fullbinpath = link;
<< "Giving up." << endl;
exit(1);
}
- lyxerr << _("Using built-in default ")
- << LYX_DIR << _(" but expect problems.")
+#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;
}
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");
}
- // Default lastfiles file: $HOME/.lyx/lastfiles
if (lyxrc.lastfiles.empty()) {
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
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");
// Read menus
readUIFile(lyxrc.ui_file);
- // Bind the X dead keys to the corresponding LyX functions if
- // necessary.
- if (lyxrc.override_x_deadkeys)
- deadKeyBindings(toplevel_keymap.get());
-
- if (lyxerr.debugging(Debug::LYXRC)) {
+ if (lyxerr.debugging(Debug::LYXRC))
lyxrc.print();
- }
os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
system_tempdir = os::getTmpDir();
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);
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
}
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;
+ << _(" and running configure...")
+ << endl;
+#endif
if (!createDirectory(user_lyxdir, 0755)) {
// Failed, let's use $HOME instead.
user_lyxdir = GetEnvPath("HOME");
- lyxerr << _("Failed. Will use ") << user_lyxdir
- << _(" instead.") << endl;
+#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
return;
}
}
-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) {
- Alert::alert(_("LyX Warning!"),
- _("Error while reading ") + lyxrc_path + ".",
- _("Using built-in defaults."));
- return false;
- }
- return true;
- } else {
- lyxerr[Debug::INIT] << "Could not find " << name << endl;
+
+ if (lyxrc.read(lyxrc_path) >= 0)
+ return;
}
- return false;
+ showFileError(name);
}
enum Uitags {
ui_menuset = 1,
ui_toolbar,
+ ui_include,
ui_last
};
struct keyword_item uitags[ui_last - 1] = {
+ { "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbar", ui_toolbar }
};
+ // 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;
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;
default:
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);
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);
string batch;
/// return the the number of arguments consumed
-typedef boost::function<int, string const &, string const &> cmd_helper;
+typedef boost::function<int(string const &, string const &)> cmd_helper;
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.level(Debug::value(arg));
Debug::showLevel(lyxerr, lyxerr.level());
return 1;
exit(1);
}
- batch = "buffer-import " + type + " " + file;
+ batch = "buffer-import " + type + ' ' + file;
return 2;
}
projects / lyx.git / blobdiff