X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyx_main.C;h=82dd64cbf9db6d70c1117adda9ca69a613d5f5c1;hb=916ae4222d5218ad7d5c2d5b989ed95437eb3491;hp=c9f0a654cf67ec7b9d30f0a22222dbad8803aa90;hpb=b395f9556b148eef11ab11130a2448d453966d70;p=lyx.git

diff --git a/src/lyx_main.C b/src/lyx_main.C
index c9f0a654cf..82dd64cbf9 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -39,6 +39,7 @@
 #include "ToolbarDefaults.h"
 #include "lyxlex.h"
 #include "encoding.h"
+#include "converter.h"
 
 using std::endl;
 
@@ -63,7 +64,7 @@ LyXServer * lyxserver = 0;
 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[])
@@ -77,8 +78,8 @@ 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.
@@ -317,10 +318,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
 	// 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 ") 
@@ -350,10 +351,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	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);
@@ -363,8 +364,12 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	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
@@ -399,6 +404,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
 	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"))
@@ -415,8 +424,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
 	// 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);
@@ -424,7 +432,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	// 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();
@@ -449,6 +457,7 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 	// lyxserver = new LyXServer;
 }
 
+
 // These are the default bindings known to LyX
 void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 {
@@ -458,6 +467,7 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	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);
@@ -496,8 +506,10 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	
         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
 }
 
+
 // LyX can optionally take over the handling of deadkeys
 void LyX::deadKeyBindings(kb_keymap * kbmap)
 {
@@ -525,7 +537,6 @@ void LyX::deadKeyBindings(kb_keymap * kbmap)
 }
 
 
-
 // This one is not allowed to use anything on the main form, since that
 // one does not exist yet. (Asger)
 void LyX::queryUserLyXDir(bool explicit_userdir)
@@ -632,7 +643,7 @@ void LyX::ReadUIFile(string const & name)
 		lex.printTable(lyxerr);
 
 	while (lex.IsOK()) {
-		switch(lex.lex()) {
+		switch (lex.lex()) {
 		case ui_menuset: 
 			menubackend.read(lex);
 			break;
@@ -680,6 +691,7 @@ void LyX::ReadEncodingsFile(string const & name)
 
 
 // Set debugging level and report result to user
+static
 void setDebuggingLevel(string const & dbgLevel)
 {
 	lyxerr << _("Setting debug level to ") <<  dbgLevel << endl;
@@ -689,6 +701,7 @@ void setDebuggingLevel(string const & dbgLevel)
 
 
 // Give command line help
+static
 void commandLineHelp()
 {
 	lyxerr << "LyX " LYX_VERSION << " of " LYX_RELEASE << endl;
@@ -702,14 +715,22 @@ void commandLineHelp()
                   "\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;
 }
 
+
 bool LyX::easyParse(int * argc, char * argv[])
 {
 	bool gui = true;
 	int removeargs = 0; // used when options are read
-	for(int i = 1; i < *argc; ++i) {
+	for (int i = 1; i < *argc; ++i) {
 		string arg = argv[i];
 
 		// Check for -dbg int
@@ -781,7 +802,7 @@ 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]);
@@ -849,7 +870,7 @@ void error_handler(int err_sig)
 	bufferlist.emergencyWriteAll();
 
 	lyxerr << "Bye." << endl;
-	if(err_sig!= SIGHUP && 
+	if (err_sig!= SIGHUP && 
 	   (!GetEnv("LYXDEBUG").empty() || err_sig == SIGSEGV))
 		lyx::abort();
 	exit(0);