#include "lyxlex.h"
#include "encoding.h"
#include "converter.h"
+#include "language.h"
+#include "support/os.h"
using std::endl;
+#ifndef CXX_GLOBAL_CSTD
+using std::signal;
+#endif
+
extern void LoadLyXFile(string const &);
extern void QuitLyX();
bool finished = false; // flag, that we are quitting the program
// convenient to have it here.
-kb_keymap * toplevel_keymap;
+boost::scoped_ptr<kb_keymap> toplevel_keymap;
LyX::LyX(int * argc, char * argv[])
bool gui = easyParse(argc, argv);
// Global bindings (this must be done as early as possible.) (Lgb)
- toplevel_keymap = new kb_keymap;
- defaultKeyBindings(toplevel_keymap);
+ toplevel_keymap.reset(new kb_keymap);
+ defaultKeyBindings(toplevel_keymap.get());
// Make the GUI object, and let it take care of the
// command line arguments that concerns it.
// Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
- init(argc, argv, gui);
+ init(gui);
lyxerr[Debug::INIT] << "Initializing LyX::init...done" << endl;
lyxGUI->init();
extern "C" void error_handler(int err_sig);
-void LyX::init(int */*argc*/, char **argv, bool gui)
+void LyX::init(bool gui)
{
// Install the signal handlers
signal(SIGHUP, error_handler);
//
string fullbinpath;
- string binpath = subst(argv[0], '\\', '/');
- string binname = OnlyFilename(argv[0]);
- // Sorry for system specific code. (SMiyata)
- if (suffixIs(binname, ".exe"))
- binname.erase(binname.length()-4, string::npos);
-
- binpath = ExpandPath(binpath); // This expands ./ and ~/
-
- if (!AbsolutePath(binpath)) {
- string binsearchpath = GetEnvPath("PATH");
- // This will make "src/lyx" work always :-)
- binsearchpath += ";.";
- binpath = FileOpenSearch(binsearchpath, argv[0]);
- }
-
+ string binpath = os::binpath();
+ string binname = os::binname();
fullbinpath = binpath;
- binpath = MakeAbsPath(OnlyPath(binpath));
-
- // In case we are running in place and compiled with shared libraries
- if (suffixIs(binpath, "/.libs/"))
- binpath.erase(binpath.length()-6, string::npos);
if (binpath.empty()) {
lyxerr << _("Warning: could not determine path of binary.")
// 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")
+ lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
+ <<_("Try the '-sysdir' command line parameter or ")
<<_("set the environment variable LYX_DIR_11x to the "
- "LyX system directory")
+ "LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl;
if (!path_shown)
lyxerr << _("Using built-in default ")
bool explicit_userdir = true;
if (user_lyxdir.empty()) {
- // LYX_USERDIR_11x environment variable
+ // LYX_USERDIR_11x environment variable
user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
- // default behaviour
+ // default behaviour
if (user_lyxdir.empty())
user_lyxdir = AddPath(GetEnvPath("HOME"),
string(".") + PACKAGE);
lyxerr[Debug::INIT] << "User LyX directory: '"
<< user_lyxdir << '\'' << endl;
- // Check that user LyX directory is ok.
- queryUserLyXDir(explicit_userdir);
+ // Check that user LyX directory is ok. We don't do that if
+ // running in batch mode.
+ if (gui)
+ queryUserLyXDir(explicit_userdir);
+ else
+ first_start = false;
//
// Shine up lyxrc defaults
ReadRcFile("lyxrc.defaults");
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
- Converter::init();
-
// Read encodings
ReadEncodingsFile("encodings");
// Read languages
- ReadLangugesFile("languages");
+ ReadLanguagesFile("languages");
// Load the layouts
lyxerr[Debug::INIT] << "Reading layouts..." << endl;
// 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);
// Bind the X dead keys to the corresponding LyX functions if
// necessary.
if (lyxrc.override_x_deadkeys)
- deadKeyBindings(toplevel_keymap);
+ deadKeyBindings(toplevel_keymap.get());
if (lyxerr.debugging(Debug::LYXRC)) {
lyxrc.print();
}
// Create temp directory
- system_tempdir = CreateLyXTmpDir(lyxrc.tempdir_path);
+ os::setTmpDir(CreateLyXTmpDir(lyxrc.tempdir_path));
+ system_tempdir = os::getTmpDir();
if (lyxerr.debugging(Debug::INIT)) {
lyxerr << "LyX tmp dir: `" << system_tempdir << '\'' << endl;
}
kbmap->bind("Down", LFUN_DOWN);
kbmap->bind("Tab", LFUN_TAB);
+ kbmap->bind("ISO_Left_Tab", LFUN_TAB); // jbl 2001-23-02
kbmap->bind("Home", LFUN_HOME);
kbmap->bind("End", LFUN_END);
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
}
break;
default:
- lex.printError("LyX::ReadUFile: "
- "Unknown menu tag: `$$Token'");
+ if(!strip(lex.GetString()).empty())
+ lex.printError("LyX::ReadUIFile: "
+ "Unknown menu tag: `$$Token'");
break;
}
}
// Read the languages file `name'
-void LyX::ReadLangugesFile(string const & name)
+void LyX::ReadLanguagesFile(string const & name)
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
}
+namespace {
+
// Set debugging level and report result to user
-static
void setDebuggingLevel(string const & dbgLevel)
{
lyxerr << _("Setting debug level to ") << dbgLevel << endl;
// Give command line help
-static
void commandLineHelp()
{
lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
"\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;
}
+} // namespace anon
+
bool LyX::easyParse(int * argc, char * argv[])
{
"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]);
projects / lyx.git / blobdiff